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

Re: git rebase +

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Oct 13, 2011, 13:21 UTC
Message-ID
<4E96E5E1.7010103@viscovery.net>
In-Reply-To
<loom.20111013T134405-495@post.gmane.org>
Am 10/13/2011 13:48, schrieb Adam Piatyszek:
Show 8 quoted lines
> In the middle of "git rebase --continue" process I hit Ctrl+C today to break
> this operation. When I tried to replay the same command it errors out with the 
> following problem:
> /project/dfttools/libexec/git-core/git-rebase--interactive: line 650: 
> /home/ediap/project.git/.git/rebase-merge/author-script: No such file or 
> directory
> 
> Is this an expected behavior?

Hitting Ctrl-C during git-rebase results undefined behavior. git-rebase is a shell script and was never designed to operate in any form of atomicity.

You should have let it run until it stopped. Then you could have said 'git rebase --abort' (if it didn't complete) or 'git reset --hard ORIG_HEAD' (if it completed).

-- Hannes
Previous: Adam PiatyszekNext: Jonathan Nieder
Message 2 of 7 in “git rebase +”
  1. Adam PiatyszekOct 13, 2011
  2. Johannes SixtOct 13, 2011
  3. interrupting "git rebase" (Re: git rebase +)Jonathan Nieder, Oct 14, 2011
  4. Jonathan NiederOct 14, 2011
  5. Martin von ZweigbergkOct 15, 2011
  6. Jonathan NiederOct 15, 2011
  7. Ramkumar RamachandraOct 17, 2011

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.