Signed-off-by: Thomas Braun <[email protected]>
---
> John Keeping <[email protected]> hat am 13. Juli 2015 um 15:11 geschrieben:
> git-rebase.sh contains:
>
> if test "$action" = "edit-todo" && test "$type" != "interactive"
> then
> die "$(gettext "The --edit-todo action can only be used during
> interactive
> rebase.")"
> fi
>
> I wonder if it's worth doing a similar check here, which presumably
> means testing if "$dir"/interactive exists.
Good point. Thanks for the hint.
contrib/completion/git-completion.bash | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index c97c648..b03050e 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1668,7 +1668,11 @@ _git_rebase ()
{
local dir="$(__gitdir)"
if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
- __gitcomp "--continue --skip --abort"
+ if [ -d "$dir"/interactive ]; then
+ __gitcomp "--continue --skip --abort --edit-todo"
+ else
+ __gitcomp "--continue --skip --abort"
+ fi
return
fi
__git_complete_strategy && return
--
2.4.5.windows.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
