Re: [PATCH v2] completion: Add '--edit-todo' to rebase

From: SZEDER Gábor <szeder@ira.uka.de>
Date: Aug 1, 2015, 09:25 UTC
Message-ID: <20150801112507.Horde.r5NtLucc5RqP3Wy8gdC7CQ1@webmail.informatik.kit.edu>
In-Reply-To: <55BBB244.3060309@virtuell-zuhause.de>

Quoting Thomas Braun <thomas.braun@virtuell-zuhause.de>:

Show 27 quoted lines

> Am 31.07.2015 um 12:16 schrieb SZEDER Gábor:
>> Anyway, so this could be something like (modulo likely whitespace damage):
>>
>> diff --git a/contrib/completion/git-completion.bash
>> b/contrib/completion/git-completion.bash
>> index 07c34ef913..fac01d6985 100644
>> --- a/contrib/completion/git-completion.bash
>> +++ b/contrib/completion/git-completion.bash
>> @@ -1667,7 +1667,10 @@ _git_push ()
>>   _git_rebase ()
>>   {
>>       local dir="$(__gitdir)"
>> -    if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
>> +    if [ -f "$dir"/rebase-merge/interactive ]; then
>> +        __gitcomp "--continue --skip --abort --edit-todo"
>> +        return
>> +    elif [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
>>           __gitcomp "--continue --skip --abort"
>>           return
>>       fi
>
> This looks much better than my attempt. Thanks.
>
> How is the protocol now? Do I reroll and add
> Helped-By: John Keeping <john@keeping.me.uk>
> Completely-Overhauled-And-Properly-Implemented: SZEDER Gábor  
> <szeder@ira.uka.de>

Ugh :) I'm quite happy with Helped-by, if you do a proper reroll after trying it out to see that it indeed does what it should.

Thanks, Gábor