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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, Nov 21, 2010 at 10:11 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Martin von Zweigbergk <martin.von.zweigbergk@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]