On Mon, Jul 13, 2015 at 01:27:56PM +0200, Thomas Braun wrote:
> Signed-off-by: Thomas Braun <thomas.br...@virtuell-zuhause.de>
> ---
>  contrib/completion/git-completion.bash | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/contrib/completion/git-completion.bash 
> b/contrib/completion/git-completion.bash
> index c97c648..2567a61 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1668,7 +1668,7 @@ _git_rebase ()
>  {
>       local dir="$(__gitdir)"
>       if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
> -             __gitcomp "--continue --skip --abort"
> +             __gitcomp "--continue --skip --abort --edit-todo"

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.

>               return
>       fi
>       __git_complete_strategy && return
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to