Re: [PATCH] rebase --abort: do not update branch ref

From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Nov 22, 2010, 12:23 UTC
Message-ID: <AANLkTikwZTZhP5biBEsf62g+GTkZN7NwX=zeF2PKhmwO@mail.gmail.com>
In-Reply-To: <7v1v6evyq5.fsf@alter.siamese.dyndns.org>

On Sun, Nov 21, 2010 at 10:11 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 27 quoted lines

> Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:
>
>> diff --git a/git-rebase.sh b/git-rebase.sh
>> index ec08f9c..3d194b1 100755
>> --- a/git-rebase.sh
>> +++ b/git-rebase.sh
>> @@ -278,12 +278,17 @@ do
>>               if test -d "$dotest"
>>               then
>>                       GIT_QUIET=$(cat "$dotest/quiet")
>> -                     move_to_original_branch
>>               else
>>                       dotest="$GIT_DIR"/rebase-apply
>>                       GIT_QUIET=$(cat "$dotest/quiet")
>> -                     move_to_original_branch
>>               fi
>
> Micronit.  It appears that GIT_QUIET is set to the same value in either
> case, so perhaps you would also want to move it outside of the if block,
> i.e.
>
>        test -d "$dotest" || dotest="$GIT_DIR/rebase-apply"
>        GIT_QUIET=$(cat "$dotest/quiet)
>        ... your rewrite to move_to_original_branch here ...
>
> no?  Staring at it further, I wonder who pays attention to GIT_QUIET in
> this codepath that will soon exit, though.

Yes, I just didn't care to change it in this patch, because I'm changing this code in the refactor I'm currently working on. OTOH, I don't mind if you do squash that in either. It might make sense since we don't yet know if my refactoring series will accepted.

Btw, I'm sure you noticed it, but also I sent a little fix for the test included in this patch. I have never used the In-Reply-To header, so I'm not sure I used it right (judging by how the threaded Gmane view presents it, I did not).

Regards, Martin