bash: use __gitdir when completing 'git rebase' options
authorSZEDER Gábor <szeder@ira.uka.de>
Thu, 6 Mar 2008 21:37:36 +0000 (22:37 +0100)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 10 Mar 2008 23:55:07 +0000 (19:55 -0400)
When doing completion of rebase options in a subdirectory of the work
tree during an ongoing rebase, wrong options were offered because of the
hardcoded .git/.dotest-merge path.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
contrib/completion/git-completion.bash

index 73ed095487fc4e9590e185b69c86ac67a6e48a8d..fc108e48288874dcaa3e2943dd7cca16ae453697 100755 (executable)
@@ -841,8 +841,8 @@ _git_push ()
 
 _git_rebase ()
 {
-       local cur="${COMP_WORDS[COMP_CWORD]}"
-       if [ -d .dotest ] || [ -d .git/.dotest-merge ]; then
+       local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)"
+       if [ -d .dotest ] || [ -d "$dir"/.dotest-merge ]; then
                __gitcomp "--continue --skip --abort"
                return
        fi