From: Eric Sunshine <sunshine@sunshineco.com>
Date: Mon, 19 Aug 2013 00:29:37 GMT
Subject: Re: [PATCH v2 2/2] rebase -i: fix core.commentchar regression
Message-ID: <CAPig+cR71yjqQhir8nTHsWuGZX5dgjpRvgdGPd4VMUn+DZok0w@mail.gmail.com>
In-Reply-To: <7vr4dqn1ko.fsf@alter.siamese.dyndns.org>

On Sun, Aug 18, 2013 at 5:14 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Eric Sunshine <sunshine@sunshineco.com> writes:
>
>> Intended for 'next'.
>
> Thanks.
>
> Will queue on top of es/rebase-i-no-abbrev, but we have a chance to
> rebuild 'next' after 1.8.4 release, so we may want to squash this
> into the problematic commit when it happens.

That would be fine. Time permitting, I also would like to send out a
couple incremental patches atop 'next' which address your comments [1]
about es/rebase-i-no-abbrev. Those new patches should be suitable for
squashing if you want to go that route.

[1]: http://thread.gmane.org/gmane.comp.version-control.git/232146

>>
>>  git-rebase--interactive.sh | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
>> index 3733312..f246810 100644
>> --- a/git-rebase--interactive.sh
>> +++ b/git-rebase--interactive.sh
>> @@ -693,7 +693,7 @@ transform_todo_ids () {
>>       while read -r command rest
>>       do
>>               case "$command" in
>> -             '#'* | exec)
>> +             "$comment_char"* | exec)
>>                       # Be careful for oddball commands like 'exec'
>>                       # that do not have a SHA-1 at the beginning of $rest.
>>                       ;;