RE: [PATCH] git-submodule: fix expansion of depth for cmd_update

2019-08-22 Thread Keller, Jacob E
> -Original Message- > From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On Behalf > Of > Junio C Hamano > Sent: Thursday, August 22, 2019 2:01 PM > To: Keller, Jacob E > Cc: git@vger.kernel.org; Jacob Keller > Subject: Re: [PATCH] git-submodule

RE: [PATCH v3] coccicheck: process every source file at once

2018-10-05 Thread Keller, Jacob E
> -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

Re: [PATCH 0/2] add format specifiers to display trailers

2016-11-29 Thread Keller, Jacob E
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 that expands to the body

Re: [PATCH] rev-list: restore the NUL commit separator in --header mode

2016-10-20 Thread Keller, Jacob E
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 > > > graph-aware > > > output) changed the way commits

Re: [PATCH v11 0/8] submodule inline diff format

2016-08-26 Thread Keller, Jacob E
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); > > } > > if

Re: [PATCH v11 5/8] allow do_submodule_path to work even if submodule isn't checked out

2016-08-26 Thread Keller, Jacob E
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 directory. > > > > This is go

Re: [PATCH v10 0/9] submodule inline diff format

2016-08-26 Thread Keller, Jacob E
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,  empt

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

2016-04-29 Thread Keller, Jacob E
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 op

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

2016-04-29 Thread Keller, Jacob E
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: > > > > > > > > Jeff King writes: > > > > > > > > > > > > > > ... H

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

2015-11-16 Thread Keller, Jacob E
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 wit

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

2015-11-16 Thread Keller, Jacob E
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 > > exclusivity as well. > > In fact,

Re: [PATCH v2 2/2] completion: add support for completing email aliases

2015-11-16 Thread Keller, Jacob E
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. > > > > Signed-off-by: Jacob Kell

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

2015-11-16 Thread Keller, Jacob E
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 > > sendemail.aliasesfile and s

Re: [PATCH] notes: document behavior of --ref and --notes DWIMery

2015-09-22 Thread Keller, Jacob E
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 th

Re: [PATCH] notes: document behavior of --ref and --notes DWIMery

2015-09-22 Thread Keller, Jacob E
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 functionality. The > > documentation > > mentioned that an unqua

Re: [PATCH 2/2] refs: loosen restriction on wildcard "*" refspecs

2015-07-23 Thread Keller, Jacob E
On Thu, 2015-07-23 at 15:12 -0700, Junio C Hamano wrote: > Eric Sunshine writes: > > > On Wed, Jul 22, 2015 at 5:05 PM, Jacob Keller < > > jacob.e.kel...@intel.com> wrote: > > > From: Jacob Keller > > > > > > Modify logic of check_refname_component and add a new disposition > > > regarding "*".

Re: Git tag: pre-receive hook issue

2015-07-20 Thread Keller, Jacob E
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 ha

Re: Problem with architecture git.

2015-07-17 Thread Keller, Jacob E
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. Sou

Re: [PATCH] gitk: Add a "Copy commit summary" command

2015-07-15 Thread Keller, Jacob E
On Tue, 2015-07-14 at 13:34 -0700, Stefan Beller wrote: > On Tue, Jul 14, 2015 at 9:42 AM, wrote: > > From: Beat Bolli > > > > When referencing earlier commits in new commit messages or other > > text, > > one of the established formats is > > > > commit ("", ) > > That sounds like I wo

RE: git notes from incoming patch

2015-03-03 Thread Keller, Jacob E
> -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" writes: > > > I

git notes from incoming patch

2015-03-02 Thread Keller, Jacob E
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 thi

git fetch specific ref fails when run against a remote where HEAD points to missing master branch

2014-09-17 Thread Keller, Jacob E
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

Re: [PATCH 8/9] autoconf: Check for timer_settime

2014-09-10 Thread Keller, Jacob E
On Wed, 2014-09-10 at 14:08 -0700, Junio C Hamano wrote: > Karsten Blees 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 newer Unices

Re: What's cooking in git.git (Sep 2014, #01; Tue, 2)

2014-09-03 Thread Keller, Jacob E
On Wed, 2014-09-03 at 12:18 -0700, Junio C Hamano wrote: > Johannes Sixt 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 t

RE: [PATCH 1/9] git-compat-util.h: Add missing semicolon after struct itimerval

2014-09-02 Thread Keller, Jacob E
> -Original Message- > From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On > Behalf Of Jonas 'Sortie' Termansen > Sent: Friday, August 29, 2014 12:44 PM > To: Junio C Hamano > Cc: git@vger.kernel.org; Keller, Jacob E; Johannes Sixt > Subj

Re: [PATCH 9/9] Use timer_settime for new platforms

2014-08-29 Thread Keller, Jacob E
On Fri, 2014-08-29 at 11:02 -0700, Junio C Hamano wrote: > Jacob Keller writes: > > > From: Jonas 'Sortie' Termansen > > > > setitimer() is an obsolescent XSI interface and may be removed in a > > future standard. Applications should use the core POSIX timer_settime() > > instead. > > > > It's i

Re: [PATCH 8/9] autoconf: Check for timer_settime

2014-08-29 Thread Keller, Jacob E
On Fri, 2014-08-29 at 19:26 +0200, Johannes Sixt wrote: > Am 29.08.2014 18:42, schrieb Jacob Keller: > > From: Jonas 'Sortie' Termansen > > > > This function will be used in a following commit. > > > > The timer_settime function is provided in librt on some systems. We > > already use this libra

Re: [PATCH 1/9] git-compat-util.h: Add missing semicolon after struct itimerval

2014-08-29 Thread Keller, Jacob E
On Fri, 2014-08-29 at 09:42 -0700, Jacob Keller wrote: > From: Jonas 'Sortie' Termansen > > This hasn't been a problem in practice as almost all systems have the > setitimer() API (or it is provided by git in the case of mingw). This code > wasn't used in any default circumstances, as the build s

Re: [PATCH 9/9] Use timer_settime for new platforms

2014-08-29 Thread Keller, Jacob E
On Thu, 2014-08-28 at 12:43 -0700, Junio C Hamano wrote: > Jonas 'Sortie' Termansen writes: > > > setitimer() is an obsolescent XSI interface and may be removed in a > > future standard. Applications should use the core POSIX timer_settime() > > instead. > > > > This patch cleans up the progress

Re: [PATCH 8/9] autoconf: Check for timer_settime

2014-08-29 Thread Keller, Jacob E
On Thu, 2014-08-28 at 03:04 +0200, Jonas 'Sortie' Termansen wrote: > This function will be used in a following commit. > > The timer_settime function is provided in librt on some systems. We > already use this library sometimes to get clock_gettime, so rework the > logic so we don't link with it t

Re: revert top most commit

2014-08-28 Thread Keller, Jacob E
On Wed, 2014-08-27 at 17:22 -0700, Jonathan Nieder wrote: > Keller, Jacob E wrote: > >> On Wed, 2014-08-27 at 21:14 +0000, Keller, Jacob E wrote: > > >>> I am having trouble using revert. If I attempt to > >>> > >>> $ git revert > >>&g

Re: revert top most commit

2014-08-28 Thread Keller, Jacob E
On Wed, 2014-08-27 at 17:22 -0700, Jonathan Nieder wrote: > Keller, Jacob E wrote: > >> On Wed, 2014-08-27 at 21:14 +0000, Keller, Jacob E wrote: > > >>> I am having trouble using revert. If I attempt to > >>> > >>> $ git revert > >>&g

Re: revert top most commit

2014-08-27 Thread Keller, Jacob E
On Wed, 2014-08-27 at 18:15 -0400, David Turner wrote: > On Wed, 2014-08-27 at 21:14 +0000, Keller, Jacob E wrote: > > Hi, > > > > I am having trouble using revert. If I attempt to > > > > $ git revert > > > > where sha1id is the same as the HEAD

Re: Improving the git remote command

2014-08-27 Thread Keller, Jacob E
On Wed, 2014-08-27 at 13:35 -0700, Junio C Hamano wrote: > David Aguilar 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 > the

revert top most commit

2014-08-27 Thread Keller, Jacob E
Hi, I am having trouble using revert. If I attempt to $ git revert 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 N�r��y��

Re: cherry picking and merge

2014-08-21 Thread Keller, Jacob E
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. > &g

Re: cherry picking and merge

2014-08-21 Thread Keller, Jacob E
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 whi

Re: [PATCH v2 5/6] stash: default listing to "--cc --simplify-combined-diff"

2014-08-12 Thread Keller, Jacob E
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

Re: [PATCH v10] tag: support configuring --sort via .gitconfig

2014-07-22 Thread Keller, Jacob E
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 > Signed-off-by: Jacob Keller > Signed-off-by: Junio C Hamano > --

Re: [PATCH v9 4/4] tag: support configuring --sort via .gitconfig

2014-07-16 Thread Keller, Jacob E
On Wed, 2014-07-16 at 14:40 -0700, Junio C Hamano wrote: > "Keller, Jacob E" writes: > > >> After all, it seems to me that the one in > >> > >> http://thread.gmane.org/gmane.comp.version-control.git/253346 > >> > >> struc

Re: [PATCH v9 4/4] tag: support configuring --sort via .gitconfig

2014-07-16 Thread Keller, Jacob E
On Wed, 2014-07-16 at 10:59 -0700, Junio C Hamano wrote: > "Keller, Jacob E" 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 e

Re: [PATCH v9 4/4] tag: support configuring --sort via .gitconfig

2014-07-16 Thread Keller, Jacob E
On Wed, 2014-07-16 at 10:59 -0700, Junio C Hamano wrote: > "Keller, Jacob E" 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 e

Re: [PATCH v8 1/4] usage: make error functions a stack

2014-07-16 Thread Keller, Jacob E
llees to > > - save away the current error/warning 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 discussio

Re: [PATCH v9 4/4] tag: support configuring --sort via .gitconfig

2014-07-15 Thread Keller, Jacob E
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 abus

Re: [PATCH v8 1/4] usage: make error functions a stack

2014-07-15 Thread Keller, Jacob E
On Tue, 2014-07-15 at 15:47 -0700, Junio C Hamano wrote: > Jacob Keller 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 rename > set to

Re: [PATCH v8 1/4] usage: make error functions a stack

2014-07-15 Thread Keller, Jacob E
On Tue, 2014-07-15 at 15:47 -0700, Junio C Hamano wrote: > Jacob Keller 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 rename > set to

Re: [PATCH 3/3] tag: support configuring --sort via .gitconfig

2014-07-15 Thread Keller, Jacob E
On Tue, 2014-07-15 at 12:12 -0700, Junio C Hamano wrote: > "Keller, Jacob E" 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 ato

Re: [PATCH 3/3] tag: support configuring --sort via .gitconfig

2014-07-15 Thread Keller, Jacob E
On Tue, 2014-07-15 at 12:12 -0700, Junio C Hamano wrote: > "Keller, Jacob E" 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 ato

Re: [PATCH 3/3] tag: support configuring --sort via .gitconfig

2014-07-15 Thread Keller, Jacob E
On Tue, 2014-07-15 at 11:17 -0700, Junio C Hamano wrote: > "Keller, Jacob E" writes: > > > On Tue, 2014-07-15 at 09:03 -0700, Junio C Hamano wrote: > > ... > >> >> Yes, that is fun. > >> >> > >> >> I actually think you

Re: [PATCH 3/3] tag: support configuring --sort via .gitconfig

2014-07-15 Thread Keller, Jacob E
On Tue, 2014-07-15 at 09:03 -0700, Junio C Hamano wrote: > "Keller, Jacob E" writes: > > > On Mon, 2014-07-14 at 10:17 -0700, Junio C Hamano wrote: > >> Jeff King writes: > >> > >> > On Sun, Jul 13, 2014 at 01:33:56PM -0400, Jeff King wrote

Re: [PATCH 3/3] tag: support configuring --sort via .gitconfig

2014-07-15 Thread Keller, Jacob E
On Mon, 2014-07-14 at 10:17 -0700, Junio C Hamano wrote: > Jeff King 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 > >>

RE: [PATCH 3/3 v5] tag: support configuring --sort via .gitconfig

2014-07-14 Thread Keller, Jacob E
> -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 wr

RE: [Bug] data loss with cyclic alternates

2014-07-14 Thread Keller, Jacob E
> -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,

Re: [PATCH 1/3] tag: use skip_prefix instead of magic numbers

2014-07-11 Thread Keller, Jacob E
On Fri, 2014-07-11 at 15:44 -0700, Junio C Hamano wrote: > Jacob Keller writes: > > > From: Jeff King > > > > Make the parsing of the --sort parameter more readable by having > > skip_prefix keep our pointer up to date. > > > > Signed-off-by: Jeff King > > Signed-off-by: Jacob Keller > > --- >

Re: [PATCH 3/3] tag: support configuring --sort via .gitconfig

2014-07-11 Thread Keller, Jacob E
On Fri, 2014-07-11 at 15:17 -0700, Junio C Hamano wrote: > Jeff King 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

Re: [PATCH 3/3 v5] tag: support configuring --sort via .gitconfig

2014-07-11 Thread Keller, Jacob E
On Fri, 2014-07-11 at 14:54 -0700, Junio C Hamano wrote: > Jeff King 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 warn.

Re: [PATCH 3/3] tag: support configuring --sort via .gitconfig

2014-07-11 Thread Keller, Jacob E
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

Re: [PATCH 3/3] tag: support configuring --sort via .gitconfig

2014-07-11 Thread Keller, Jacob E
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 > Signed-off-by: Jacob Keller > --- > Updated based on Junio's sugg

Re: [PATCH 2/2 v4] tag: support configuring --sort via .gitconfig

2014-07-11 Thread Keller, Jacob E
On Fri, 2014-07-11 at 11:29 -0700, Junio C Hamano wrote: > "Keller, Jacob E" 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. > >

Re: [PATCH 3/3 v5] tag: support configuring --sort via .gitconfig

2014-07-11 Thread Keller, Jacob E
On Fri, 2014-07-11 at 14:22 -0400, Jeff King wrote: > On Fri, Jul 11, 2014 at 06:11:08PM +0000, 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 >

Re: [PATCH 3/3 v5] tag: support configuring --sort via .gitconfig

2014-07-11 Thread Keller, Jacob E
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 actual

Re: [PATCH 1/3] tag: use skip_prefix instead of magic numbers

2014-07-11 Thread Keller, Jacob E
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 > > I suspect Junio may just app

Re: [Bug] data loss with cyclic alternates

2014-07-11 Thread Keller, Jacob E
On Fri, 2014-07-11 at 09:01 -0700, Junio C Hamano wrote: > Ephrim Khong 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 have it" and

Re: pitfall with empty commits during git rebase

2014-07-11 Thread Keller, Jacob E
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

Re: [PATCH 2/2 v4] tag: support configuring --sort via .gitconfig

2014-07-11 Thread Keller, Jacob E
On Fri, 2014-07-11 at 08:04 -0700, Junio C Hamano wrote: > Jacob Keller writes: > > > + > > + if (strcmp(arg, "refname")) > > + die(_("unsupported sort specification %s"), arg); > > Hmm. I _thought_ we try to catch unsupported option value coming > from the command line and die but

Re: [PATCH 2/2 v4] tag: support configuring --sort via .gitconfig

2014-07-11 Thread Keller, Jacob E
On Fri, 2014-07-11 at 08:04 -0700, Junio C Hamano wrote: > Jacob Keller 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 > > Signed-off-by: Jacob Kelle

Re: [PATCH 2/2 v4] tag: support configuring --sort via .gitconfig

2014-07-11 Thread Keller, Jacob E
On Fri, 2014-07-11 at 08:04 -0700, Junio C Hamano wrote: > Jacob Keller 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 > > Signed-off-by: Jacob Kelle

Re: [PATCH] gitignore: add .version as this is generated during a make

2014-07-10 Thread Keller, Jacob E
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 te

Re: [PATCH v4] linuxptp: add phc_ctl program to help debug PHC devices

2014-07-10 Thread Keller, Jacob E
On Thu, 2014-07-10 at 16:20 -0700, Junio C Hamano wrote: > Jacob Keller 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 of a message t

Re: [PATCH] makefile: add ability to run specific test files

2014-07-10 Thread Keller, Jacob E
On Thu, 2014-07-10 at 04:14 +, Junio C Hamano wrote: > On Wed, Jul 9, 2014 at 4:49 PM, Keller, Jacob E > 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 > >&

Re: [PATCH v2] tag: support configuring --sort via .gitconfig

2014-07-10 Thread Keller, Jacob E
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 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 should

Re: [PATCH] makefile: add ability to run specific test files

2014-07-10 Thread Keller, Jacob E
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 > 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 > >&

Re: [PATCH v2] tag: support configuring --sort via .gitconfig

2014-07-10 Thread Keller, Jacob E
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; > > +

Re: [PATCH] makefile: add ability to run specific test files

2014-07-09 Thread Keller, Jacob E
On Wed, 2014-07-09 at 15:59 -0700, Junio C Hamano wrote: > Jacob Keller 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, instead of muck

Re: [PATCH] tag: support configuring --sort via .gitconfig

2014-07-09 Thread Keller, Jacob E
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 se

Re: [PATCH] remote-curl: do not complain on EOF from parent git

2014-07-09 Thread Keller, Jacob E
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). Nitp

Re: t3200-branch.sh number 102 fails when run under make test

2014-07-09 Thread Keller, Jacob E
On Wed, 2014-07-09 at 16:54 -0400, Jeff King wrote: > On Wed, Jul 09, 2014 at 08:37:51PM +0000, 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. > &g

Re: t3200-branch.sh number 102 fails when run under make test

2014-07-09 Thread Keller, Jacob E
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

t3200-branch.sh number 102 fails when run under make test

2014-07-09 Thread Keller, Jacob E
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 && # ( #

RE: [StGit PATCH] Fix dirty index errors when resolving conflicts

2013-07-17 Thread Keller, Jacob E
> -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