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

From: Christian Couder <christian.couder@gmail.com>
Date: Feb 19, 2019, 14:18 UTC
Message-ID: <CAP8UFD2a6D1W_X0T3O8FTinBwVC1qoBk+jx84B-dQzRrieu_Xw@mail.gmail.com>
In-Reply-To: <CAJPSwc0Xu=HoF5XrqnFj_1ZrshM3HFb78tJkXOTWZ=HJX8Akgg@mail.gmail.com>

On Tue, Feb 19, 2019 at 3:03 PM Sebastián Mancilla <smancill.m@gmail.com> wrote:

Show 5 quoted lines

>
> My system is macOS Mojave 10.14.2. I normally use Git from Homebrew (currently
> Git 2.20.1).
>
> I investigated this further, and I think I found the problem on my end.

[...]

> I also did bisect Git (I never though I would be bisecting Git itself).
> It landed in this commit: 4d010a757c (sequencer: use read_author_script(),
> 2018-10-31).

Thanks for investigating this.

Show 5 quoted lines

> And the content of .git/rebase-merge/author-script is always the same:
>
>         GIT_AUTHOR_NAME='Sebastián Mancilla'
>         GIT_AUTHOR_EMAIL='smancill@jlab.org'
>         GIT_AUTHOR_DATE='@1550530007 -0300

When I look at such a file I get the following:

GIT_AUTHOR_DATE='@1549569954 -0800'

so it seems to me that a single quote is missing at the end of the line in your file, which might explain the error.

Not sure which software is writing this file, but from what you described it might be the tig you had previously installed.