mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
bash: use __gitdir when completing 'git rebase' options
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>
This commit is contained in:
parent
6753f2aa55
commit
51fe120903
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue