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

Re: Rebase doesn't restore branch pointer back on out of memory

From
Andrew Wong <andrew.kw.w@gmail.com>
Date
Oct 4, 2012, 22:52 UTC
Message-ID
<506E1327.1070602@gmail.com>
In-Reply-To
<CAGAhT3k=T0SGngMQkbXHqNfh-=LUb71C7CSrWXP2wsAgc8Tb8A@mail.gmail.com>
On 10/04/2012 05:09 PM, Alexander Kostikov wrote:
> Full script is uploaded to
> https://dl.dropbox.com/u/10828740/rebase.log  Here is the last page:

Judging from that log, I'm pretty sure "rebase" is failing at "format-patch". I was able to reproduce the issue you're having: "rebase" finished and modified the branch even though it actually failed.

"rebase" is not catching that error. I'll try to come up with a patch to fix it later tonight, so that "rebase" will fail correctly. And when it does, you'll be able to do "rebase --abort" to go back to your original state.

Previous: Alexander KostikovNext: Alexander Kostikov
Message 6 of 17 in “Rebase doesn't restore branch pointer back on out of memory”
  1. Alexander KostikovOct 3, 2012
  2. Andrew WongOct 3, 2012
  3. Andrew WongOct 4, 2012
  4. Alexander KostikovOct 4, 2012
  5. Alexander KostikovOct 4, 2012
  6. Andrew WongOct 4, 2012
  7. Alexander KostikovOct 4, 2012
  8. Andrew WongOct 5, 2012
  9. [RFC] rebase: Handle cases where format-patch failsAndrew Wong, Oct 5, 2012
  10. Junio C HamanoOct 5, 2012
  11. Andrew WongOct 8, 2012
  12. [RFC] rebase: Handle cases where format-patch failsAndrew Wong, Oct 8, 2012
  13. Junio C HamanoOct 8, 2012
  14. Andrew WongOct 11, 2012
  15. rebase: Handle cases where format-patch failsAndrew Wong, Oct 11, 2012
  16. Alexander KostikovOct 19, 2012
  17. Junio C HamanoOct 19, 2012

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.