On Wed, May 09, 2012 at 11:41:13AM -0700, Junio C Hamano wrote: > SZEDER Gábor <szeder@xxxxxxxxxx> writes: > > > The standard way to find out the path to the repository in the > > completion script is the __gitdir() helper function, because that > > handles the repository path given on the command line (i.e. git > > --git-dir=/path/to/repo log --<TAB>). However, there is one > > exception: the completion function for 'git log' still uses 'git > > rev-parse --git-dir' directly, and could offer (or not) the '--merge' > > option erroneously when the repository is specified on the command > > line. > > Here `--merge` is the visible symptom, and the real issue you fixed is > that it used to be looking into a repository that is different from the > user is working with, right [*1*]? Exactly; will add a sentence about it to be more explicit in the reroll. Note, however, that this doesn't influence refs completion, because __git_refs() does use __gitdir(), so it will look into the right repository. Gábor -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html