git annex merge out of memory on large repos

This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawnxlx1UrzVhdy6_gFjzmF42x6QXxBUxg00 2013-09-07 19:22:57 +00:00 committed by admin
parent 0ab6764fe9
commit eff8d85a54

View file

@ -0,0 +1,32 @@
### Please describe the problem.
`git annex merge` goes out of memory on a large repo.
### What steps will reproduce the problem?
$ git annex merge
merge git-annex git-annex: out of memory (requested 1048576 bytes)
### What version of git-annex are you using? On what operating system?
git-annex version: 4.20130827
build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
On debian wheezy i386
### Please provide any additional information below.
The repository contains a lot of files:
$ cd .git/objects
$ find . -type f | wc -l
1091548
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
# End of transcript or log.
"""]]