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

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

From
Alexander Kostikov <alex.kostikov@gmail.com>
Date
Oct 3, 2012, 19:47 UTC
Message-ID
<CAGAhT3kofdaQEye9QHnvFhAAzoQqZtR7d5UzbxU+zEdkAHVfuQ@mail.gmail.com>
Hi,

I'd like to report a bug in git (observed on git version 1.7.11.msysgit.1). When you do a rebase and it fails due to out of memory exception, rebased branch pointer is changed but commits are not rebased. That makes commits that you are rebasing unreachable (except via reflog):

» git lg
* 4c60761 - (origin/master, origin/HEAD, master) ...

» git rebase master sql_script First, rewinding head to replay your work on top of it... fatal: Out of memory? mmap failed: No error

» git lg
* 4c60761 - (HEAD, origin/master, origin/HEAD, sql_script, master) ...

» git reflog sql_script 4c60761 sql_script@{0}: rebase finished: refs/heads/sql_script onto 4c60761303fccbb0860b28e8094ad17ae8b01d07 13555ed sql_script@{1}: branch: Reset to sql_script@{1}

Expected behaviour:
- restore branch to pre-rebase location on out of memory exception
- not to fall with out of memory in the first place. But for our
repository that could be fixed only after either:
--- a) msysgit would have x64 binary (currently it's not available)
--- b) rebase -m option could be used by default somehow (currently
it's not possible so specify default -m)

-- Alexander Kostikov

Next: Andrew Wong
Message 1 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.