Re: git rebase --continue after solving conflicts doesn't work anymore

From: Phillip Wood <phillip.wood@talktalk.net>
Date: Feb 19, 2019, 09:59 UTC
Message-ID: <317468c6-40cc-9f26-8ee3-3392c3908efb@talktalk.net>
In-Reply-To: <CAPig+cQHx_BuxwZS7+juBdgKyAWhStU=9kFhs2hf=wjOMGAd7Q@mail.gmail.com>

Dear Sebastián

On 19/02/2019 07:22, Eric Sunshine wrote:

> [cc:+phillip.wood@talktalk.net]

Thanks Eric

Show 10 quoted lines

> On Tue, Feb 19, 2019 at 1:45 AM Christian Couder
> <christian.couder@gmail.com> wrote:
>> On Tue, Feb 19, 2019 at 5:20 AM Sebastián Mancilla <smancill.m@gmail.com> wrote:
>>> But since Git 2.20.x it doesn't work anymore. Now after solving the conflicts
>>> and running "git rebase --continue" I get this error most of the time:
>>>
>>>      error: unable to dequote value of 'GIT_AUTHOR_DATE'
>>
>> It looks like this can happen only when an "author-script" file (most
>> likely .git/rebase-merge/author-script)

or it could be .git/rebase-apply/author-script depending on the options passed to rebase when it started (the sequencer and am use the same code for reading the author script now)

Show 6 quoted lines

>> is read by the sequencer
>> mechanism. Could you show us the content of this file on your machine?
> 
> A very good suggestion considering that there have been changes
> recently specifically related to the parsing of GIT_AUTHOR_DATE in C
> code.

That would be very helpful, without seeing that it's hard to know what the problem is.

Best Wishes

Phillip