bash: use __gitdir when completing 'git rebase' options

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 73ed095487fc4e9590e185b69c86ac67a6e48a8d..fc108e48288874dcaa3e2943dd7cca16ae453697 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -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