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

5 files changed, 98 insertions, 0 deletions

diff --git a/doc/bugs/Complete_failure_trying_to_unannex_a_large_annex.mdwn b/doc/bugs/Complete_failure_trying_to_unannex_a_large_annex.mdwn
new file mode 100644
index 000000000..b59dd8b5d
--- /dev/null
+++ b/doc/bugs/Complete_failure_trying_to_unannex_a_large_annex.mdwn
@@ -0,0 +1,53 @@
+I really don't know what's happened here, I just did `git annex unannex .` in a very large annex:
+
+    unannex Inbox/Lolcat.JPG (Recording state in git...)
+    ok
+    unannex Inbox/Lolcat.jpg (Recording state in git...)
+    ok
+    unannex Inbox/May 2012 Photo Stream/120502_0004.JPG (Recording state in git...)
+    ok
+    unannex Inbox/May 2012 Photo Stream/120518_0005.JPG (Recording state in git...)
+    ok
+    unannex Inbox/May 2012 Photo Stream/120523_0006.JPG (Recording state in git...)
+    ok
+    unannex Inbox/May 2012 Photo Stream/120523_0007.JPG (Recording state in git...)
+    ok
+    unannex Inbox/My boyfriend of 7 years and I are both physicists. Here's how he proposed to me. - Imgur.jpg (Recording state in git...)
+    ok
+    unannex Inbox/Nov 2012 Photo Stream/121102_0035.JPG (Recording state in git...)
+    ok
+    unannex Inbox/Nov 2012 Photo Stream/121102_0036.JPG (Recording state in git...)
+    ok
+    unannex Inbox/Nov 2012 Photo Stream/121102_0037.JPG (Recording state in git...)
+    ok
+    unannex Inbox/Nov 2012 Photo Stream/121102_0038.JPG (Recording state in git...)
+    ok
+    unannex Inbox/Nov 2012 Photo Stream/121102_0039.JPG (Recording state in git...)
+    ok
+    unannex Inbox/Nov 2012 Photo Stream/121103_0040.JPG (Recording state in git...)
+    ok
+    unannex Inbox/Nov 2012 Photo Stream/121104_0041.JPG (Recording state in git...)
+    ok
+    unannex Inbox/Nov 2012 Photo Stream/121105_0042.JPG (Recording state in git...)
+    error: bad index file sha1 signature
+    fatal: index file corrupt
+    git-annex: failed to read sha from git write-tree
+    git-annex: git commit [Param "-q",Params "-m",Param "content removed from git annex",Param "--",File "Inbox/Nov 2012 Photo Stream/121105_0042.JPG"] failed
+    Vulcan:~/Pictures $ ga unannex .
+    unannex Inbox/Nov 2012 Photo Stream/121109_0043.JPG error: bad index file sha1 signature
+    fatal: index file corrupt
+
+    git-annex: fd:12: hClose: resource vanished (Broken pipe)
+    failed
+    git-annex: pre-commit: 1 failed
+    git-annex: git commit [Param "-q",Params "-m",Param "content removed from git annex",Param "--",File "Inbox/Nov 2012 Photo Stream/121109_0043.JPG"] failed
+    Vulcan:~/Pictures $ ga -F unannex .
+    unannex Inbox/Nov 2012 Photo Stream/121124_0044.JPG error: bad index file sha1 signature
+    fatal: index file corrupt
+
+    git-annex: fd:12: hClose: resource vanished (Broken pipe)
+    failed
+    git-annex: pre-commit: 1 failed
+    git-annex: git commit [Param "-q",Params "-m",Param "content removed from git annex",Param "--",File "Inbox/Nov 2012 Photo Stream/121124_0044.JPG"] failed
+
+I guess now I'll just try to unlink the symlinks by hand, and drop the `.git` directory?
diff --git a/doc/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/comment_7_1175f9be789d4c1907f0be98e435bd2f._comment b/doc/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/comment_7_1175f9be789d4c1907f0be98e435bd2f._comment
new file mode 100644
index 000000000..1f11f8bed
--- /dev/null
+++ b/doc/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/comment_7_1175f9be789d4c1907f0be98e435bd2f._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 7"
+ date="2013-03-04T00:57:38Z"
+ content="""
+With the new Preferences page I added to the webapp today you can also enable debugging while the assistant is running if it starts to misbehave.
+
+However, I'm in no hurry to close this bug just yet.
+"""]]
diff --git a/doc/bugs/encryption_key_is_surprising/comment_2_5b7e6bb36c3333dfd71808e8b4544746._comment b/doc/bugs/encryption_key_is_surprising/comment_2_5b7e6bb36c3333dfd71808e8b4544746._comment
new file mode 100644
index 000000000..24f8452c3
--- /dev/null
+++ b/doc/bugs/encryption_key_is_surprising/comment_2_5b7e6bb36c3333dfd71808e8b4544746._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://phil.0x539.de/"
+ nickname="Philipp Kern"
+ subject="comment 2"
+ date="2013-03-04T07:36:55Z"
+ content="""
+GPG also reduces the key material to the size of a SHA1 hash (because we're using the default option for s2k-digest-algo) to generate the symmetric key used with CAST5. So I wonder a bit why we bother with 512 bytes in the first place. Also they come from urandom (even on Linux), despite being generated once per remote. So maybe the strongness of the weakest link should be written down somewhere.
+"""]]
diff --git a/doc/bugs/encryption_key_is_surprising/comment_4_c5e49b3a0eceabe6d14f5226d7ba4c7a._comment b/doc/bugs/encryption_key_is_surprising/comment_4_c5e49b3a0eceabe6d14f5226d7ba4c7a._comment
new file mode 100644
index 000000000..a685626e5
--- /dev/null
+++ b/doc/bugs/encryption_key_is_surprising/comment_4_c5e49b3a0eceabe6d14f5226d7ba4c7a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 4"
+ date="2013-03-04T17:29:28Z"
+ content="""
+What do you mean by \"reduces\"? I assume it doesn't just take the first N bytes?
+"""]]
diff --git a/doc/design/assistant/blog/day_201__real_Android_wrapup/comment_1_88b9950c51324f0bb89c5646b3170952._comment b/doc/design/assistant/blog/day_201__real_Android_wrapup/comment_1_88b9950c51324f0bb89c5646b3170952._comment
new file mode 100644
index 000000000..b9edfc4b6
--- /dev/null
+++ b/doc/design/assistant/blog/day_201__real_Android_wrapup/comment_1_88b9950c51324f0bb89c5646b3170952._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="http://ao2.it/"
+ nickname="ao2"
+ subject="Using the Emulator?"
+ date="2013-03-04T13:58:18Z"
+ content="""
+Hi Joey,
+
+while you wait for some actual Android device have you tried the emulator?
+
+I've recently started playing with Android without any physical device, and the emulator is pretty responsive with hardware acceleration on (you need to run an x86 AVD).
+
+Here are some instructions: http://git.ao2.it/android/android-app-development-getting-started.git/blob/HEAD:/android-app-development-getting-started.sh
+
+Also, are you going to use a WebView connecting to the haskell web server for the WebApp?
+
+Ciao,
+   Antonio
+"""]]