Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2014-07-04 14:17:11 -04:00
commit 8f67151f2a
Failed to extract signature
6 changed files with 68 additions and 0 deletions

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.55"
subject="comment 2"
date="2014-07-04T17:52:35Z"
content="""
This problem should be fixed in the most recent daily build of git-annex for android. Testing appreciated.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.55"
subject="comment 2"
date="2014-07-04T17:58:10Z"
content="""
If you run git-annex with the --debug flag, you can see the git command that is presumably what is failing. You could then probably run the same git command manually and see if it fails that way too.
Does your git repository have a large pack file (in `.git/objects/pack`) as mentioned in the msysgit bug report?
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.55"
subject="comment 3"
date="2014-07-04T17:52:41Z"
content="""
This problem should be fixed in the most recent daily build of git-annex for android. Testing appreciated.
"""]]

View file

@ -0,0 +1,26 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.55"
subject="comment 18"
date="2014-07-04T18:03:54Z"
content="""
You can manually move files and use `git annex fsck`, but it is not likely to be any faster.
---
After letting a 2 million file import run while I was away on vacation, I came back to it, and it indeed ran out of memory:
<pre>
add 999996 ok
add 999997 ok
(Recording state in git...)
[2014-06-21 11:49:28 JEST] feed: xargs [\"-0\",\"git\",\"--git-dir=/home/joey/tmp/r/.git\",\"--work-tree=/home/joey/tmp/r\",\"add\",\"--\"]
add 999998 ok
add 999999 ok
[2014-06-21 11:49:49 JEST] read: git [\"--git-dir=/home/joey/tmp/r/.git\",\"--work-tree=/home/joey/tmp/r\",\"diff\",\"--name-only\",\"--diff-filter=T\",\"-z\",\"--\",\".\"]
(Recording state in git...)
[2014-06-21 11:52:24 JEST] feed: xargs [\"-0\",\"git\",\"--git-dir=/home/joey/tmp/r/.git\",\"--work-tree=/home/joey/tmp/r\",\"add\",\"--\"]
Stack space overflow: current size 8388608 bytes.
Use `+RTS -Ksize -RTS' to increase it.
</pre>
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.55"
subject="comment 19"
date="2014-07-04T18:18:41Z"
content="""
[[bugs/runs_of_of_memory_adding_2_million_files]]
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.55"
subject="comment 2"
date="2014-07-04T17:55:45Z"
content="""
<http://git-annex.branchable.com/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/>
"""]]