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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html