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

2 files changed, 26 insertions, 0 deletions

diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_6_1f712693d2ded5abceb869fdb7f47ef3._comment b/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_6_1f712693d2ded5abceb869fdb7f47ef3._comment
new file mode 100644
index 000000000..9e28682b4
--- /dev/null
+++ b/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_6_1f712693d2ded5abceb869fdb7f47ef3._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.21"
+ subject="finally!"
+ date="2013-07-31T16:47:39Z"
+ content="""
+I've finally been clued in to the cause of this. If a ssh-agent is running, and has been configured to use a ssh key (by running `ssh-add`), this apparently prevents git-annex from using the key it sets up during local pairing. I have reproduced the described bug by this method.
+
+Something similar might also affect adding a remote ssh server, I'm not sure about that yet.
+
+
+"""]]
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_7_7a5ead0ce5c9429d4723ccce4f6a6d6c._comment b/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_7_7a5ead0ce5c9429d4723ccce4f6a6d6c._comment
new file mode 100644
index 000000000..136bca8f4
--- /dev/null
+++ b/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_7_7a5ead0ce5c9429d4723ccce4f6a6d6c._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.0.21"
+ subject="workaround"
+ date="2013-07-31T17:19:01Z"
+ content="""
+Looks like the fix is to edit ~/.ssh/config and in each stanza added by git-annex, add this line:
+
+        IdentitiesOnly yes
+
+This prevents the ssh-agent from using the normal key, and allows the git-annex key to be used instead.
+
+People experiencing this bug can manually make that change. Then if you edit your git-annex repository's `.git/config` and delete the `annex-ignore` line, the assistant should finally learn the UUID and start syncing.
+"""]]