* Out of memory error with git rebase
@ 2011-10-26 9:21 Hannu Koivisto
2011-10-26 10:55 ` Johannes Sixt
0 siblings, 1 reply; 4+ messages in thread
From: Hannu Koivisto @ 2011-10-26 9:21 UTC (permalink / raw
To: git
Hi,
If 'git rebase origin/master' dies with an out of memory error
(probably due to a few of large binary files in the repository, the
largest being ~300MB and ~1GB in total in one directory), which
settings should be tweaked and how to get rid of the problem? I
tried...
[pack]
threads = 1
windowMemory = 64M
packSizeLimit = 512M
...based on some suggestions in the net but that was of no help.
I'm using git 1.7.5.1 in Cygwin and I also tried the latest master
branch version (which behaved identically).
--
Hannu
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Out of memory error with git rebase
2011-10-26 9:21 Out of memory error with git rebase Hannu Koivisto
@ 2011-10-26 10:55 ` Johannes Sixt
2011-10-31 10:33 ` Hannu Koivisto
0 siblings, 1 reply; 4+ messages in thread
From: Johannes Sixt @ 2011-10-26 10:55 UTC (permalink / raw
To: Hannu Koivisto; +Cc: git
Am 26.10.2011 11:21, schrieb Hannu Koivisto:
> If 'git rebase origin/master' dies with an out of memory error
> (probably due to a few of large binary files in the repository, the
> largest being ~300MB and ~1GB in total in one directory), which
> settings should be tweaked and how to get rid of the problem? I
> tried...
Try 'git rebase -m origin/master'. Without -m, rebase uses
format-patch+am, i.e., assuming there are changes to the binary files
that are to be rebased, a binary patch file would have to be generated
and applied later. This is very likely where git bails out.
-- Hannes
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Out of memory error with git rebase
2011-10-26 10:55 ` Johannes Sixt
@ 2011-10-31 10:33 ` Hannu Koivisto
2011-10-31 20:21 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Hannu Koivisto @ 2011-10-31 10:33 UTC (permalink / raw
To: git
Johannes Sixt <j6t@kdbg.org> writes:
> Am 26.10.2011 11:21, schrieb Hannu Koivisto:
>> If 'git rebase origin/master' dies with an out of memory error
>> (probably due to a few of large binary files in the repository, the
>
> Try 'git rebase -m origin/master'. Without -m, rebase uses
> format-patch+am, i.e., assuming there are changes to the binary files
> that are to be rebased, a binary patch file would have to be generated
> and applied later. This is very likely where git bails out.
Thanks, -m seems to help, even though the large binary files are
not touched by the rebased commits (instead, they are touched by
the commits on top of which I'm rebasing).
>From the documentation I can't figure out any reason why one
wouldn't always want to use -m. Why is it not the default? I
think it's pretty much impossible for ordinary users to figure out
that they need -m in a situation like this.
--
Hannu
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Out of memory error with git rebase
2011-10-31 10:33 ` Hannu Koivisto
@ 2011-10-31 20:21 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2011-10-31 20:21 UTC (permalink / raw
To: Hannu Koivisto; +Cc: git
Hannu Koivisto <azure@iki.fi> writes:
> From the documentation I can't figure out any reason why one
> wouldn't always want to use -m. Why is it not the default? I
> think it's pretty much impossible for ordinary users to figure out
> that they need -m in a situation like this.
Because most people do not have too large binary blobs in the history, and
at least when "rebase" was originally written, merge-based rebasing was
way slower than patch-based one.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-10-31 20:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-26 9:21 Out of memory error with git rebase Hannu Koivisto
2011-10-26 10:55 ` Johannes Sixt
2011-10-31 10:33 ` Hannu Koivisto
2011-10-31 20:21 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).