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

4 files changed, 48 insertions, 0 deletions

diff --git a/doc/bugs/map_error_after_forget/comment_2_24f3b6699f646ec0c20f3d4ca010e345._comment b/doc/bugs/map_error_after_forget/comment_2_24f3b6699f646ec0c20f3d4ca010e345._comment
new file mode 100644
index 000000000..6ac154ac1
--- /dev/null
+++ b/doc/bugs/map_error_after_forget/comment_2_24f3b6699f646ec0c20f3d4ca010e345._comment
@@ -0,0 +1,28 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkBEmz5XoJVzN0u-0nOtpn7BBBDHsiLmxY"
+ nickname="Eric"
+ subject="comment 2"
+ date="2014-03-15T16:17:18Z"
+ content="""
+actually i removed .../xubuntu/... from the initial bug report, here is the text scraped directly from xterm.
+
+
+xubuntu@tab:/media/xubuntu/archive/annex$ git annex map --debug
+map /media/xubuntu/archive/annex ok
+[2014-03-15 11:10:17 CDT] read: git [\"config\",\"--null\",\"--list\"]
+[2014-03-15 11:10:17 CDT] read: git [\"config\",\"--null\",\"--list\"]
+[2014-03-15 11:10:17 CDT] read: git [\"config\",\"--null\",\"--list\"]
+
+git-annex: user error (git [\"config\",\"--null\",\"--list\"] exited 126)
+failed
+git-annex: map: 1 failed
+xubuntu@tab:/media/xubuntu/archive/annex$ git remote 
+archive-backup
+bkup06-a81d-1000
+bkup08-da84-1000
+bkup19-0064
+master
+master-backup
+...
+no obvious errors on non-zero return codes from running `git config --null --list` on all remotes
+"""]]
diff --git a/doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_1_004cb3015895ad67386276f3e1f0de0d._comment b/doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_1_004cb3015895ad67386276f3e1f0de0d._comment
new file mode 100644
index 000000000..e1db22b2e
--- /dev/null
+++ b/doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_1_004cb3015895ad67386276f3e1f0de0d._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.154"
+ subject="comment 1"
+ date="2014-03-15T16:01:53Z"
+ content="""
+I see the problem, although I have not quite managed to reproduce it. I think this would probably only happen if you have the unusual character in the extension of the file (or are using the WORM backend).
+
+I've put a fix in git. It will be available in the next autobuild, in half an hour or so.
+"""]]
diff --git a/doc/design/metadata/comment_4_c32ade1524487e5fdc6f83b2db39f04c._comment b/doc/design/metadata/comment_4_c32ade1524487e5fdc6f83b2db39f04c._comment
new file mode 100644
index 000000000..01f917ef5
--- /dev/null
+++ b/doc/design/metadata/comment_4_c32ade1524487e5fdc6f83b2db39f04c._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="bremner"
+ ip="198.164.160.48"
+ subject="convenient way to query metadata?"
+ date="2014-03-15T20:58:28Z"
+ content="""
+I'd like to be able to do something like \"git annex metadata -q fieldname\" and have that output the value(s) of fieldname.  I see I could parse the json output but that isn't too convenient in a shell script. Or have I missed something that already exists?
+"""]]
diff --git a/doc/todo/add_a_--branch_to_applicable_git-annex_commands.mdwn b/doc/todo/add_a_--branch_to_applicable_git-annex_commands.mdwn
new file mode 100644
index 000000000..b2678bee8
--- /dev/null
+++ b/doc/todo/add_a_--branch_to_applicable_git-annex_commands.mdwn
@@ -0,0 +1,2 @@
+My original use case was for using git-annex find from scripts, where I didn't want to depend on the branch 
+checked out at the time, but rather write something like "git annex find --branch=master $searchterms"