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

4 files changed, 60 insertions, 0 deletions

diff --git a/doc/bugs/It_is_very_easy_to_turn_git-annex_into_a_zombie.mdwn b/doc/bugs/It_is_very_easy_to_turn_git-annex_into_a_zombie.mdwn
new file mode 100644
index 000000000..dd92591e6
--- /dev/null
+++ b/doc/bugs/It_is_very_easy_to_turn_git-annex_into_a_zombie.mdwn
@@ -0,0 +1,23 @@
+What steps will reproduce the problem?
+
+Run the git-annex assitant, and then "sudo kill" it.
+
+What is the expected output? What do you see instead?
+
+I expect it to die, instead I end up with:
+
+    14604   ??  S      0:00.64 ga assistant
+    14623   ??  Z      0:00.00 (git)
+    14624   ??  Z      0:00.00 (git)
+    14936   ??  Z      0:00.00 (git-annex)
+
+The only way to clear these zombies is to reboot.  Perhaps there is some resource not being correctly terminated under exceptional conditions?
+
+Note that on OpenIndiana the problem is even more severe: Aborting git-annex at the wrong time leaves behind both zombie processes and lock files which cause the machine to suddenly halt if I try to access them in any way (via mv, rsync, etc)!
+
+What version of git-annex are you using? On what operating system?
+
+4d1e0c9 on OS X 10.8.2.
+
+Please provide any additional information below.
+
diff --git a/doc/bugs/It_is_very_easy_to_turn_git-annex_into_a_zombie/comment_1_d5fba6c061fb21795021ea83070dbfa2._comment b/doc/bugs/It_is_very_easy_to_turn_git-annex_into_a_zombie/comment_1_d5fba6c061fb21795021ea83070dbfa2._comment
new file mode 100644
index 000000000..8d7eea6c5
--- /dev/null
+++ b/doc/bugs/It_is_very_easy_to_turn_git-annex_into_a_zombie/comment_1_d5fba6c061fb21795021ea83070dbfa2._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89"
+ nickname="John"
+ subject="Correction"
+ date="2012-10-20T05:34:47Z"
+ content="""
+If I \"sudo kill -9\" all the processes in the above group after deleting the annex directories, then they do go away without needing to reboot.
+"""]]
diff --git a/doc/bugs/Pairing_locally_shows:___34__bad_comment_in_ssh_public_key_ssh-rsa__34__.mdwn b/doc/bugs/Pairing_locally_shows:___34__bad_comment_in_ssh_public_key_ssh-rsa__34__.mdwn
new file mode 100644
index 000000000..fb252fa75
--- /dev/null
+++ b/doc/bugs/Pairing_locally_shows:___34__bad_comment_in_ssh_public_key_ssh-rsa__34__.mdwn
@@ -0,0 +1,21 @@
+Open two webapp sessions (in two different *screen* windows or whatever)
+
+    name@name-Computermodel-1000:~/test/annex1$ git-annex webapp
+    name@name-Computermodel-1000:~/test/annex2$ git-annex webapp
+
+In annex1's web UI, choose *Configuration* -> *Manage repositories* -> *Local computer*.
+
+Fill in the secret phrase and press *Start pairing*.
+
+In annex2's web UI, a pairing request will show on the left notifications bar. Choose *Respond*, fill in the phrase field and press *Finish pairing*.
+
+I was expecting a pairing between the two running session. But I got this after pressing *Finish pairing* in annex2's web UI:
+
+**start of output**
+# Internal Server Error
+
+bad comment in ssh public key ssh-rsa [very long GPG key jibber jabber] name@name-Computermodel-1000
+
+**end of output**
+
+git-annex version: 3.20121017, Ubuntu 12.04
diff --git a/doc/todo/wishlist:_An_option_like_--git-dir/comment_3_0c3709b07a0a1091ceeee73b69e0f7ac._comment b/doc/todo/wishlist:_An_option_like_--git-dir/comment_3_0c3709b07a0a1091ceeee73b69e0f7ac._comment
new file mode 100644
index 000000000..a76c42d9d
--- /dev/null
+++ b/doc/todo/wishlist:_An_option_like_--git-dir/comment_3_0c3709b07a0a1091ceeee73b69e0f7ac._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89"
+ nickname="John"
+ subject="Response"
+ date="2012-10-20T05:21:13Z"
+ content="""
+@Justin If you have full shell access on the remote your solution works fine, but not if git-annex is the only binary you are allowed to execute.
+"""]]