git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Christian Couder <christian.couder@gmail.com>
Date
Feb 19, 2019, 06:45 UTC
Message-ID
<CAP8UFD22QMJyiJmQO1YVFmBkZuzex58+QBbTbdCCVHa8OGCQJA@mail.gmail.com>
In-Reply-To
<CAJPSwc1GuifK9BdssWQsf+oVY0Aw+PLM1pgAiis7UdV1tZrpew@mail.gmail.com>
On Tue, Feb 19, 2019 at 5:20 AM Sebastián Mancilla <smancill.m@gmail.com> wrote:
Show 13 quoted lines
>
> I've always used "git rebase --continue" as the help shows:
>
>     Resolve all conflicts manually, mark them as resolved with
>     "git add/rm <conflicted_files>", then run "git rebase --continue".
>
> and Git would apply the conflicted commit without issues and the rebase would
> continue.
>
> 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) is read by the sequencer mechanism. Could you show us the content of this file on your machine? It could also help if you could give us information about your OS and locale.

Show 24 quoted lines
>     error: you have staged changes in your working tree
>     If these changes are meant to be squashed into the previous commit, run:
>
>       git commit --amend
>
>     If they are meant to go into a new commit, run:
>
>       git commit
>
>     In both cases, once you're done, continue with:
>
>       git rebase --continue
>
>     error: could not commit staged changes.
>
> Now I have to run "git commit" first to commit manually and then do the "git
> rebase --continue".
>
> I've compiled 2.18.2 and 2.19.2 to check and the error doesn't happen.
>
> It is present in 2.20.x and current master v2.21.0-rc1-9-gca1b411648.
>
>
> Is it a regression because of the new rebase written in C?
That's possible.

Thanks for the report, Christian.

Previous: Sebastián MancillaNext: Eric Sunshine
Message 2 of 9 in “git rebase --continue after solving conflicts doesn't work anymore”
  1. Sebastián MancillaFeb 19, 2019
  2. Christian CouderFeb 19, 2019
  3. Eric SunshineFeb 19, 2019
  4. Phillip WoodFeb 19, 2019
  5. Sebastián MancillaFeb 19, 2019
  6. Duy NguyenFeb 19, 2019
  7. Sebastián MancillaFeb 19, 2019
  8. Christian CouderFeb 19, 2019
  9. Phillip WoodFeb 19, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.