Re: What's cooking in git.git (Jun 2013, #03; Thu, 6)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 7, 2013, 01:05 UTC
- Message-ID
- <7vli6mwx07.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20130607000006.GA25731@goldbirke>
SZEDER Gábor <szeder@ira.uka.de> writes:
Show 19 quoted lines
> On Thu, Jun 06, 2013 at 03:41:08PM -0700, Junio C Hamano wrote: >> * rr/complete-difftool (2013-06-03) 2 commits >> (merged to 'next' on 2013-06-04 at 01c7611) >> + completion: clarify ls-tree, archive, show completion >> + completion: difftool takes both revs and files >> >> Update command line completion (in contrib/) to use a better named >> completion helper function for commands that take revisions and >> paths. >> >> Will merge to 'master'. > > This should not be merged to master as is; the one at the top because > of the reasons given in $gmane/226272, the one at the bottom because > of the misleading commit message (__git_complete_file() always > completed refs first as part of the ref:file notation, so it worked > just fine except for the ref1...ref2 notation; the real reason for > calling __git_complete_revlist_file() for difftool is to make clear > that difftool takes ref1...ref2:file, too).
Oops.
It is too late to amend the log messages now, but at least a follow-up patch can fix the breakage by adding __git_complete_file() back. Would you mind doing that?
Thanks.