From: Phillip Wood <phillip.wood@talktalk.net>
To: "Eric Sunshine" <sunshine@sunshineco.com>,
"Christian Couder" <christian.couder@gmail.com>,
"Sebastián Mancilla" <smancill.m@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: git rebase --continue after solving conflicts doesn't work anymore
Date: Tue, 19 Feb 2019 09:59:24 +0000 [thread overview]
Message-ID: <317468c6-40cc-9f26-8ee3-3392c3908efb@talktalk.net> (raw)
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
> 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)
>> 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
next prev parent reply other threads:[~2019-02-19 9:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-19 4:17 git rebase --continue after solving conflicts doesn't work anymore Sebastián Mancilla
2019-02-19 6:45 ` Christian Couder
2019-02-19 7:22 ` Eric Sunshine
2019-02-19 9:59 ` Phillip Wood [this message]
2019-02-19 14:03 ` Sebastián Mancilla
2019-02-19 14:14 ` Duy Nguyen
2019-02-19 14:25 ` Sebastián Mancilla
2019-02-19 14:18 ` Christian Couder
2019-02-19 14:32 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=317468c6-40cc-9f26-8ee3-3392c3908efb@talktalk.net \
--to=phillip.wood@talktalk.net \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood@dunelm.org.uk \
--cc=smancill.m@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).