> -Original Message-
> From: Jeff King [mailto:p...@peff.net]
> Sent: Friday, October 05, 2018 9:25 AM
> To: SZEDER Gábor
> Cc: Jacob Keller ; Keller, Jacob E
> ; Git mailing list
> Subject: Re: [PATCH v3] coccicheck: process every source file at once
>
> On
On Mon, 2016-11-21 at 09:23 -0800, Junio C Hamano wrote:
> Jacob Keller writes:
>
> > > We have %s and %b so that we can reconstruct the whole thing by
> > > using both. It is unclear how %bT fits in this picture. I
> > > wonder
> > > if we also need another placeholder
On Wed, 2016-10-19 at 15:39 -0700, Junio C Hamano wrote:
> Jacob Keller writes:
>
> >
> > Hi,
> >
> > On Wed, Oct 19, 2016 at 2:04 PM, Dennis Kaarsemaker
> > wrote:
> > >
> > > Commit 660e113 (graph: add support for --line-prefix on all
> > >
On Fri, 2016-08-26 at 12:17 -0700, Stefan Beller wrote:
> On Thu, Aug 25, 2016 at 4:32 PM, Jacob Keller om> wrote:
>
> >
> > @@ -487,12 +490,14 @@ static void do_submodule_path(struct strbuf
> > *buf, const char *path,
> > strbuf_addstr(buf, git_dir);
>
On Fri, 2016-08-26 at 11:19 -0700, Junio C Hamano wrote:
> Jacob Keller writes:
>
> >
> > Currently, do_submodule_path will attempt locating the .git
> > directory by
> > using read_gitfile on /.git. If this fails it just assumes
> > the
> > /.git is actually a git
On Fri, 2016-08-26 at 10:35 -0700, Stefan Beller wrote:
> > a) read_gitfile on /.git
> > b) if read_gitfile succeeds, use it's contents, otherwise use
> > /.git for next steps
> > c) check if the resulting file is a git directory, we're fine.. we
> > found a gitdir, so stop.
> > d) otherwise,
On Fri, 2016-04-29 at 15:44 -0700, Stefan Beller wrote:
> >
> > Currently it's an "opt in" knob, so this doesn't make sense to me.
> +static int diff_compaction_heuristic = 1;
>
Oops didn't know we'd made it default at some point. (all my versions
had it disabled by default)
> It's rather an
On Fri, 2016-04-29 at 15:35 -0700, Stefan Beller wrote:
> On Fri, Apr 29, 2016 at 3:18 PM, Junio C Hamano
> wrote:
> >
> > Jacob Keller writes:
> >
> > >
> > > On Fri, Apr 29, 2016 at 1:29 PM, Junio C Hamano > > m> wrote:
> > > >
On Mon, 2015-11-16 at 18:56 -0500, Eric Sunshine wrote:
> On Mon, Nov 16, 2015 at 6:50 PM, Eric Sunshine om> wrote:
> > Also, shouldn't --list-aliases (or --dump-aliases) be mutually
> > exclusive with many of the other options? New tests would check
> > such
> >
On Mon, 2015-11-16 at 18:33 -0500, Eric Sunshine wrote:
> On Sun, Nov 15, 2015 at 3:22 PM, Jacob Keller om> wrote:
> > Using the new --list-aliases option from git-send-email, add
> > completion
> > for --to, --cc, and --bcc with the available configured aliases.
> >
> >
On Mon, 2015-11-16 at 18:50 -0500, Eric Sunshine wrote:
> It should be possible to extract the alias within the shell itself
> without a separate process. For instance:
>
> read alias rest
>
> will leave the first token in $alias and the remainder of the line in
> $rest, and it's all done
On Mon, 2015-11-16 at 18:30 -0500, Eric Sunshine wrote:
> On Sun, Nov 15, 2015 at 3:22 PM, Jacob Keller om> wrote:
> > Add an option "list-aliases" which changes the default behavior of
> > git-send-email. This mode will simply read the alias files
> > configured by
> >
On Tue, 2015-09-22 at 13:40 -0700, Junio C Hamano wrote:
> How about phrasing it totally differently?
>
> The ref specifies the full refname when it begins with
> `refs/notes/`; otherwise `ref/notes/` is prefixed to form a
> full name of the ref.
>
> I think that would remove
On Tue, 2015-09-22 at 13:40 -0700, Junio C Hamano wrote:
> Jacob Keller writes:
>
> > From: Jacob Keller
> >
> > The --notes and --ref parameter for selecting which notes ref to
> > operate
> > on are based off of expand_notes_ref
On Thu, 2015-07-23 at 15:12 -0700, Junio C Hamano wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
On Wed, Jul 22, 2015 at 5:05 PM, Jacob Keller
jacob.e.kel...@intel.com wrote:
From: Jacob Keller jacob.kel...@gmail.com
Modify logic of check_refname_component and add a new
On Mon, 2015-07-20 at 13:13 +0530, Gaurav Chhabra wrote:
Hi Jake,
Thanks about the refs/tags check. I’m aware about this. Junio also
explained it in one of his replies. I was actually confused why my
current code was working in past for few of the annotated tags.
Anyways, now that I have
On Fri, 2015-07-17 at 15:12 +, Alexander wrote:
Hello,
I have problem with architecure of my project, help me to resolve
problem
. I want to do in my remote repo two branches with two different
working
folders (master , dev ) to check it . How can I do it ?
Thank you.
Sounds
On Tue, 2015-07-14 at 13:34 -0700, Stefan Beller wrote:
On Tue, Jul 14, 2015 at 9:42 AM, dev+...@drbeat.li wrote:
From: Beat Bolli dev+...@drbeat.li
When referencing earlier commits in new commit messages or other
text,
one of the established formats is
commit abbrev-sha
-Original Message-
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent: Tuesday, March 03, 2015 12:14 PM
To: Keller, Jacob E
Cc: git@vger.kernel.org
Subject: Re: git notes from incoming patch
Keller, Jacob E jacob.e.kel...@intel.com writes:
I am wondering whether
Hi,
I am wondering whether it is possible to read from a format-patch input
and add notes when we generate the applied patch.
The use case is to be able to send patches that had notes appended via
$git format-patch --notes ...
And have notes objects created on the remote repository to store
Hi,
I am assuming this is simply a configuration issue on my end for this
particular remote, because I never pushed to the master branch, and so
the HEAD of this remote doesn't exist.
However, I am also using it to fetch specific refs I know the name of,
so it confuses me when I try to fetch and
On Wed, 2014-09-10 at 14:08 -0700, Junio C Hamano wrote:
Karsten Blees karsten.bl...@gmail.com writes:
While the timer extension (timer_settime) has graduated to mandatory in
the current POSIX spec, the monotonic clock extension is still optional
today (i.e. not necessarily supported even
On Wed, 2014-09-03 at 12:18 -0700, Junio C Hamano wrote:
Johannes Sixt j...@kdbg.org writes:
But IMHO, this topic goes in a wrong direction. Avoid deprecated
interfaces is way overrated. It would be preferable (IMHO) to implement
setitimer() in compat/ for systems that don't have it.
I
On Wed, 2014-08-27 at 17:22 -0700, Jonathan Nieder wrote:
Keller, Jacob E wrote:
On Wed, 2014-08-27 at 21:14 +, Keller, Jacob E wrote:
I am having trouble using revert. If I attempt to
$ git revert sha1id
where sha1id is the same as the HEAD commit, I instead get the output
On Wed, 2014-08-27 at 17:22 -0700, Jonathan Nieder wrote:
Keller, Jacob E wrote:
On Wed, 2014-08-27 at 21:14 +, Keller, Jacob E wrote:
I am having trouble using revert. If I attempt to
$ git revert sha1id
where sha1id is the same as the HEAD commit, I instead get the output
Hi,
I am having trouble using revert. If I attempt to
$ git revert sha1id
where sha1id is the same as the HEAD commit, I instead get the output of
what looks like git status.
Is there anything specific about git revert that prevents it from
reverting the most recent commit?
Thanks,
Jake
On Wed, 2014-08-27 at 13:35 -0700, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
We have some internal scripts at Disney Animation that rely on git remote
output so I would vote for #3 personally as well.
I take it that you mean you would vote _against_ #3 which will break
On Wed, 2014-08-27 at 18:15 -0400, David Turner wrote:
On Wed, 2014-08-27 at 21:14 +, Keller, Jacob E wrote:
Hi,
I am having trouble using revert. If I attempt to
$ git revert sha1id
where sha1id is the same as the HEAD commit, I instead get the output of
what looks like
On Fri, 2014-08-01 at 09:56 -0700, Mike Stump wrote:
Since everything I do goes up and down into repositories and I don’t want my
friends and family to scorn me, rebase isn’t the command I want to use.
You completely mis-understand what published means. Published history
is history from which
On Thu, 2014-08-21 at 17:36 +, Keller, Jacob E wrote:
On Fri, 2014-08-01 at 09:56 -0700, Mike Stump wrote:
Since everything I do goes up and down into repositories and I don’t want
my friends and family to scorn me, rebase isn’t the command I want to use.
You completely mis-understand
On Wed, 2014-07-30 at 20:09 -0400, Jeff King wrote:
On Wed, Jul 30, 2014 at 12:43:09PM -0700, Junio C Hamano wrote:
git log --cc is one of the things I wanted for a long time to fix.
When the user explicitly asks --cc, we currently ignore it, but
because we know the user wants to view
On Wed, 2014-07-16 at 14:48 -0700, Jacob Keller wrote:
Add support for configuring default sort ordering for git tags. Command
line option will override this configured value, using the exact same
syntax.
Cc: Jeff King p...@peff.net
Signed-off-by: Jacob Keller jacob.e.kel...@intel.com
routines;
- set error/warning routines to its own custom versions;
- call the callees;
- set error/warning routines back to their original; and
- return from it
at least in the code paths under discussion?
On Tue, Jul 15, 2014 at 4:26 PM, Keller, Jacob E
jacob.e.kel...@intel.com
On Wed, 2014-07-16 at 10:59 -0700, Junio C Hamano wrote:
Keller, Jacob E jacob.e.kel...@intel.com writes:
On Tue, 2014-07-15 at 19:42 -0400, Jeff King wrote:
On Tue, Jul 15, 2014 at 04:32:59PM -0700, Jacob Keller wrote:
+static void error_bad_sort_config(const char *err, va_list
On Wed, 2014-07-16 at 10:59 -0700, Junio C Hamano wrote:
Keller, Jacob E jacob.e.kel...@intel.com writes:
On Tue, 2014-07-15 at 19:42 -0400, Jeff King wrote:
On Tue, Jul 15, 2014 at 04:32:59PM -0700, Jacob Keller wrote:
+static void error_bad_sort_config(const char *err, va_list
On Wed, 2014-07-16 at 14:40 -0700, Junio C Hamano wrote:
Keller, Jacob E jacob.e.kel...@intel.com writes:
After all, it seems to me that the one in
http://thread.gmane.org/gmane.comp.version-control.git/253346
struck the right balance among various abuses; let's use the error
On Mon, 2014-07-14 at 10:17 -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
On Sun, Jul 13, 2014 at 01:33:56PM -0400, Jeff King wrote:
I realize that I am reinventing the error-reporting wheel on a sleepy
Sunday afternoon without having thought about it much, so there is
On Tue, 2014-07-15 at 09:03 -0700, Junio C Hamano wrote:
Keller, Jacob E jacob.e.kel...@intel.com writes:
On Mon, 2014-07-14 at 10:17 -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
On Sun, Jul 13, 2014 at 01:33:56PM -0400, Jeff King wrote:
I realize that I am
On Tue, 2014-07-15 at 11:17 -0700, Junio C Hamano wrote:
Keller, Jacob E jacob.e.kel...@intel.com writes:
On Tue, 2014-07-15 at 09:03 -0700, Junio C Hamano wrote:
...
Yes, that is fun.
I actually think your In 'version:pefname' and 'wersion:refname',
we want be able to report
On Tue, 2014-07-15 at 12:12 -0700, Junio C Hamano wrote:
Keller, Jacob E jacob.e.kel...@intel.com writes:
I am going to re-submit this with an enum-style return. I am also
changing how we parse so that we can correctly report whether the sort
function or sort atom is incorrect.
Oh, our
On Tue, 2014-07-15 at 12:12 -0700, Junio C Hamano wrote:
Keller, Jacob E jacob.e.kel...@intel.com writes:
I am going to re-submit this with an enum-style return. I am also
changing how we parse so that we can correctly report whether the sort
function or sort atom is incorrect.
Oh, our
On Tue, 2014-07-15 at 15:47 -0700, Junio C Hamano wrote:
Jacob Keller jacob.e.kel...@intel.com writes:
extern void set_error_routine(void (*routine)(const char *err, va_list
params));
+extern void pop_error_routine(void);
pop that undoes set smells somewhat weird. Perhaps we should
On Tue, 2014-07-15 at 15:47 -0700, Junio C Hamano wrote:
Jacob Keller jacob.e.kel...@intel.com writes:
extern void set_error_routine(void (*routine)(const char *err, va_list
params));
+extern void pop_error_routine(void);
pop that undoes set smells somewhat weird. Perhaps we should
On Tue, 2014-07-15 at 19:42 -0400, Jeff King wrote:
On Tue, Jul 15, 2014 at 04:32:59PM -0700, Jacob Keller wrote:
+static void error_bad_sort_config(const char *err, va_list params)
+{
+ vreportf(warning: tag.sort has , err, params);
+}
This feels a little like an abuse of the
-Original Message-
From: Jeff King [mailto:p...@peff.net]
Sent: Friday, July 11, 2014 10:57 PM
To: Keller, Jacob E
Cc: gits...@pobox.com; dr.kh...@gmail.com; git@vger.kernel.org
Subject: Re: [Bug] data loss with cyclic alternates
On Fri, Jul 11, 2014 at 06:01:46PM +, Keller
-Original Message-
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent: Sunday, July 13, 2014 10:01 AM
To: Jeff King
Cc: Keller, Jacob E; git@vger.kernel.org
Subject: Re: [PATCH 3/3 v5] tag: support configuring --sort via .gitconfig
Jeff King p...@peff.net writes:
On Fri
On Fri, 2014-07-11 at 08:04 -0700, Junio C Hamano wrote:
Jacob Keller jacob.e.kel...@intel.com writes:
Add support for configuring default sort ordering for git tags. Command
line option will override this configured value, using the exact same
syntax.
Cc: Jeff King p...@peff.net
On Fri, 2014-07-11 at 08:04 -0700, Junio C Hamano wrote:
Jacob Keller jacob.e.kel...@intel.com writes:
Add support for configuring default sort ordering for git tags. Command
line option will override this configured value, using the exact same
syntax.
Cc: Jeff King p...@peff.net
On Fri, 2014-07-11 at 12:15 +0200, Olaf Hering wrote:
There is an incorrect message when doing git rebase -i remote/branch.
I have it only in german, see below. what happend is:
#01 make changes on another host
#02 copy patchfile to localhost
#03 apply patchfile
#04 git commit -avs #
On Fri, 2014-07-11 at 09:01 -0700, Junio C Hamano wrote:
Ephrim Khong dr.kh...@gmail.com writes:
git seems to have issues with alternates when cycles are present (repo
A has B/objects as alternates, B has A/objects as alternates).
Yeah, don't do that. A thinks eh, the other guy must
On Fri, 2014-07-11 at 13:50 -0400, Jeff King wrote:
On Fri, Jul 11, 2014 at 10:24:05AM -0700, Jacob Keller wrote:
Make the parsing of the --sort parameter more readable by having
skip_prefix keep our pointer up to date.
Authored-by: Jeff King p...@peff.net
I suspect Junio may just
On Fri, 2014-07-11 at 13:46 -0400, Jeff King wrote:
On Fri, Jul 11, 2014 at 10:24:07AM -0700, Jacob Keller wrote:
Updated to include changes due to Junio's feedback. This has not resolved
whether we should fail on a configuration error or simply warn. It appears
that
we actually seem
On Fri, 2014-07-11 at 14:22 -0400, Jeff King wrote:
On Fri, Jul 11, 2014 at 06:11:08PM +, Keller, Jacob E wrote:
I personally prefer error out on options, even though it can make it a
bit more difficult, though as far as I know unknown fields simply warn
or are ignored. (ie: old
On Fri, 2014-07-11 at 11:29 -0700, Junio C Hamano wrote:
Keller, Jacob E jacob.e.kel...@intel.com writes:
This is not how the rest of the current tests work. I will submit a
patch which fixes up the current --sort tests (but not every test, for
now) as well.
I do not want to pile more
On Fri, 2014-07-11 at 13:51 -0700, Jacob Keller wrote:
Add support for configuring default sort ordering for git tags. Command
line option will override this configured value, using the exact same
syntax.
Cc: Jeff King p...@peff.net
Signed-off-by: Jacob Keller jacob.e.kel...@intel.com
---
On Fri, 2014-07-11 at 17:06 -0400, Jeff King wrote:
On Fri, Jul 11, 2014 at 01:51:35PM -0700, Jacob Keller wrote:
+ if (!strcmp(var, tag.sort)) {
+ if (!value)
+ return config_error_nonbool(var);
+ status = parse_sort_string(value, tag_sort);
+
On Fri, 2014-07-11 at 14:54 -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
On Fri, Jul 11, 2014 at 10:24:07AM -0700, Jacob Keller wrote:
Updated to include changes due to Junio's feedback. This has not resolved
whether we should fail on a configuration error or simply
On Fri, 2014-07-11 at 15:17 -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
On Fri, Jul 11, 2014 at 01:51:35PM -0700, Jacob Keller wrote:
+ if (!strcmp(var, tag.sort)) {
+ if (!value)
+ return config_error_nonbool(var);
+ status =
On Fri, 2014-07-11 at 15:44 -0700, Junio C Hamano wrote:
Jacob Keller jacob.e.kel...@intel.com writes:
From: Jeff King p...@peff.net
Make the parsing of the --sort parameter more readable by having
skip_prefix keep our pointer up to date.
Signed-off-by: Jeff King p...@peff.net
On Thu, 2014-07-10 at 00:07 -0400, Jeff King wrote:
On Wed, Jul 09, 2014 at 03:36:51PM -0700, Jacob Keller wrote:
+static int parse_sort_string(const char *arg)
+{
+ int sort = 0;
+ int flags = 0;
+
+ if (*arg == '-') {
+ flags |= REVERSE_SORT;
+ arg++;
On Wed, 2014-07-09 at 21:14 -0700, Junio C Hamano wrote:
On Wed, Jul 9, 2014 at 4:49 PM, Keller, Jacob E
jacob.e.kel...@intel.com wrote:
On Wed, 2014-07-09 at 15:59 -0700, Junio C Hamano wrote:
What kind of things are missing, exactly? Perhaps that is something
you need to fix, instead
On Thu, 2014-07-10 at 15:34 -0400, Jeff King wrote:
On Thu, Jul 10, 2014 at 10:59:36AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I know this is existing code you are moving, but I noticed it looks ripe
for using skip_prefix. Perhaps while we are in the area we
On Thu, 2014-07-10 at 04:14 +, Junio C Hamano wrote:
On Wed, Jul 9, 2014 at 4:49 PM, Keller, Jacob E
jacob.e.kel...@intel.com wrote:
On Wed, 2014-07-09 at 15:59 -0700, Junio C Hamano wrote:
What kind of things are missing, exactly? Perhaps that is something
you need to fix, instead
On Thu, 2014-07-10 at 16:20 -0700, Junio C Hamano wrote:
Jacob Keller jacob.e.kel...@intel.com writes:
This is an updated version of a script I wrote a couple years ago for
I suspect that this is not for us ;-)
--
To unsubscribe from this list: send the line unsubscribe git in
the body
On Thu, 2014-07-10 at 16:13 -0700, Jonathan Nieder wrote:
Hi,
Jacob Keller wrote:
Subject: gitignore: add .version as this is generated during a make
What program generates that file? When I build on a Debian machine, I
get
$ make
[...]
SUBDIR templates
Hello,
I recently cloned the master branch of the git repo, and when I ran make
test, it fails on test 102 of the t3200-branch.sh test cases.
not ok 102 - tracking with unexpected .fetch refspec
#
# rm -rf a b c d
# git init a
# (
#
On Wed, 2014-07-09 at 13:37 -0700, Jacob E Keller wrote:
Hello,
I recently cloned the master branch of the git repo, and when I ran make
test, it fails on test 102 of the t3200-branch.sh test cases.
not ok 102 - tracking with unexpected .fetch refspec
#
# rm -rf a b c d
#
On Wed, 2014-07-09 at 16:54 -0400, Jeff King wrote:
On Wed, Jul 09, 2014 at 08:37:51PM +, Keller, Jacob E wrote:
I recently cloned the master branch of the git repo, and when I ran make
test, it fails on test 102 of the t3200-branch.sh test cases.
Just a guess, but try reverting
On Wed, 2014-07-09 at 17:20 -0400, Jeff King wrote:
The parent git process is supposed to send us an empty line
to indicate that the conversation is over. However, the
parent process may die() if there is a problem with the
operaiton (e.g., we try to fetch a ref that does not exist).
On Wed, 2014-07-09 at 17:58 -0400, Jeff King wrote:
On Wed, Jul 09, 2014 at 02:21:00PM -0700, Jacob Keller wrote:
Add support for configuring default sort ordering for git tags. Command
line option will override this configured value, using the exact same
syntax.
This makes sense, and
On Wed, 2014-07-09 at 15:59 -0700, Junio C Hamano wrote:
Jacob Keller jacob.e.kel...@intel.com writes:
Running a specific test file manually does not obtain the exact
environment setup by the Makefile.
What kind of things are missing, exactly? Perhaps that is something
you need to fix,
-Original Message-
From: Zane Bitter [mailto:zbit...@redhat.com]
Sent: Wednesday, July 17, 2013 6:57 AM
To: git@vger.kernel.org
Cc: Keller, Jacob E; Waskiewicz Jr, Peter P; catalin.mari...@gmail.com
Subject: [StGit PATCH] Fix dirty index errors when resolving conflicts
The patch
72 matches
Mail list logo