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

5 files changed, 63 insertions, 27 deletions

diff --git a/doc/bugs/copy_fails_for_some_fails_without_explanation/comment_11_dabfec2d74fb847f3b40093a2866045b._comment b/doc/bugs/copy_fails_for_some_fails_without_explanation/comment_11_dabfec2d74fb847f3b40093a2866045b._comment
new file mode 100644
index 000000000..09fabcf1c
--- /dev/null
+++ b/doc/bugs/copy_fails_for_some_fails_without_explanation/comment_11_dabfec2d74fb847f3b40093a2866045b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 11"
+ date="2014-03-10T19:20:42Z"
+ content="""
+Well you can always grab one of the daily builds, which include this fix.
+"""]]
diff --git a/doc/bugs/enormous_fsck_output_OOM/comment_9_8de694dff75e27856c8282d1f2d120b6._comment b/doc/bugs/enormous_fsck_output_OOM/comment_9_8de694dff75e27856c8282d1f2d120b6._comment
new file mode 100644
index 000000000..a26e58c58
--- /dev/null
+++ b/doc/bugs/enormous_fsck_output_OOM/comment_9_8de694dff75e27856c8282d1f2d120b6._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 9"
+ date="2014-03-10T19:17:34Z"
+ content="""
+I've gotten this down to 900 mb used, in the case where every single line lists a different sha. Possibly more important, if lines repeat shas, or are extraneous, memory usage will be significantly lower. This might be enough to get it working in Aaron's repository, especially if the bulk of the git fsck output was about dangling objects, which are now ignored without buffering them all in memory.
+
+The memory usage is just about as low as is possible; it takes a fair amount of memory just to hold 300 thousand shas in memory. And the git repair process needs to keep track of every broken sha. (Maybe there's a way to stream them, but I don't immediately see one.)
+
+I hesitate to say this means the problem is truly fixed. I have some much larger repositories with eg, `git count-objects -v` reporting 2 million objects. If they all went corrupt, it would still use too much memory.
+
+One improvement would be to store Shas in packed memory, rather than as strings like they are now. That would probably half the memory used. It still does not seem like a full solution.
+"""]]
diff --git a/doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup/comment_6_7d0d49fd165af5e30606982e05335d34._comment b/doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup/comment_6_7d0d49fd165af5e30606982e05335d34._comment
new file mode 100644
index 000000000..bd6fcad6a
--- /dev/null
+++ b/doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup/comment_6_7d0d49fd165af5e30606982e05335d34._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 6"
+ date="2014-03-10T19:24:45Z"
+ content="""
+I suppose it would be useful to look at the output of `git log git-annex..13d365f16ffdb5a393f66362b840d3f21bb4c59c --oneline -n1`
+
+Either than command is outputting a huge amount of stuff, or it's actually causing git (not git-annex) to use a lot of memory. Not sure which it is from the description.
+"""]]
diff --git a/doc/bugs/id__95__rsa_on_android.mdwn b/doc/bugs/id__95__rsa_on_android.mdwn
new file mode 100644
index 000000000..07983869e
--- /dev/null
+++ b/doc/bugs/id__95__rsa_on_android.mdwn
@@ -0,0 +1,31 @@
+### Please describe the problem.
+
+I generated id_rsa and id_rsa.pub from the android shell.
+After copying the id_rsa.pub file on my server, ssh on android complains because id_rsa permissions on the phone are too open (660).
+Chmod 600 id_rsa on /sdcard/git-annex.home/.ssh/id_rsa has no effect, i.e. permissions remain 660.
+
+### What steps will reproduce the problem?
+use ssh-keygen to generate keys, default location is /sdcard/git-annex.home/.ssh/
+copy id_rsa.pub on ssh server, try to connect from android to ssh server.
+
+
+### What version of git-annex are you using? On what operating system?
+latest git-annex.apk (2014-03-06) on android 4.4.2
+
+### Please provide any additional information below.
+
+
+root@android:/ # /data/data/ga.androidterm/runshell
+Falling back to hardcoded app location; cannot find expected files in /data/app-lib
+
+root@android:/sdcard/git-annex.home # ssh MYSERVERIP -p PORT -l USERNAME
+
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+@         WARNING: UNPROTECTED PRIVATE KEY FILE!          @
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+Permissions 0660 for '/sdcard/git-annex.home/.ssh/id_rsa' are too open.
+It is required that your private key files are NOT accessible by others.
+This private key will be ignored.
+bad permissions: ignore key: /sdcard/git-annex.home/.ssh/id_rsa
+
+
diff --git a/doc/forum/Problems_with_large_numbers_of_files/comment_8_0070d1fbb643380b92bd974564fb9702._comment b/doc/forum/Problems_with_large_numbers_of_files/comment_8_0070d1fbb643380b92bd974564fb9702._comment
deleted file mode 100644
index 8976942bf..000000000
--- a/doc/forum/Problems_with_large_numbers_of_files/comment_8_0070d1fbb643380b92bd974564fb9702._comment
+++ /dev/null
@@ -1,27 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o"
- nickname="Aaron"
- subject="Too big to fsck"
- date="2014-02-17T22:33:38Z"
- content="""
-Hi,
-
-My Webapp isn't working:
-$ git-annex webapp
-error: refs/gcrypt/gitception+ does not point to a valid object!
-error: refs/remotes/Beta/git-annex does not point to a valid object!
-error: refs/remotes/Beta/master does not point to a valid object!
-fatal: unable to read tree 656e7db5be172f01c0b6994d01f1a08d1273af12
-
-So I tried to repair it:
-$ git-annex repair
-Running git fsck ...
-Stack space overflow: current size 8388608 bytes.
-Use `+RTS -Ksize -RTS' to increase it.
-
-So I tried to follow your advice here and increase the stack:
-$ git-annex +RTS -K35000000 -RTS fsck
-git-annex: Most RTS options are disabled. Link with -rtsopts to enable them.
-
-I wasn't sure what to do next, so any help would be appreciated. 
-"""]]