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

4 files changed, 39 insertions, 0 deletions

diff --git a/doc/bugs/Assistant:_synchronisation_between_to_regular_repositories_hangs_.mdwn b/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_.mdwn
index 8e6c4f468..8e6c4f468 100644
--- a/doc/bugs/Assistant:_synchronisation_between_to_regular_repositories_hangs_.mdwn
+++ b/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_.mdwn
diff --git a/doc/bugs/Assistant:_synchronisation_between_to_regular_repositories_hangs_/comment_1_36d1207818c8db747dbf94d9a48e3e98._comment b/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_/comment_1_36d1207818c8db747dbf94d9a48e3e98._comment
index 3750d1a28..3750d1a28 100644
--- a/doc/bugs/Assistant:_synchronisation_between_to_regular_repositories_hangs_/comment_1_36d1207818c8db747dbf94d9a48e3e98._comment
+++ b/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_/comment_1_36d1207818c8db747dbf94d9a48e3e98._comment
diff --git a/doc/required_content/comment_1_b9576aaa31258e9bdf18a4eac8d61bfb._comment b/doc/required_content/comment_1_b9576aaa31258e9bdf18a4eac8d61bfb._comment
new file mode 100644
index 000000000..5e859d8f2
--- /dev/null
+++ b/doc/required_content/comment_1_b9576aaa31258e9bdf18a4eac8d61bfb._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnG-DZQa3d3Jn7K2q36TlbmZ8v2YuV-23M"
+ nickname="Fer"
+ subject="Command line?"
+ date="2015-03-17T13:31:34Z"
+ content="""
+Th expression format in the file is the same as preferred, but the latter can be set through command line (git-annex wanted REPO EXP), but I can't find any way to set required through command line. Is there any way, in the works, or not planned?
+
+Thanks!
+"""]]
diff --git a/doc/tips/using_gitolite_with_git-annex/comment_23_70dcb7e7ffdd14351adaf4c40ee7fdd0._comment b/doc/tips/using_gitolite_with_git-annex/comment_23_70dcb7e7ffdd14351adaf4c40ee7fdd0._comment
new file mode 100644
index 000000000..095159afa
--- /dev/null
+++ b/doc/tips/using_gitolite_with_git-annex/comment_23_70dcb7e7ffdd14351adaf4c40ee7fdd0._comment
@@ -0,0 +1,29 @@
+[[!comment format=hs
+ username="risca"
+ subject="Problem solved!"
+ date="2015-03-17T09:37:04Z"
+ content="""
+I was experiencing the same issue (FATAL: bad git-annex-shell command: git-annex-shell 'configlist' '/myrepo' at /usr/share/gitolite3/commands/git-annex-shell line 25, <DATA> line 1.)
+
+I solved with the following patch:
+
+--- /usr/share/gitolite3/commands/git-annex-shell       2015-03-17 10:26:46.114680811 +0100
++++ orig.git-annex-shell        2015-03-17 10:25:16.074680925 +0100
+@@ -23,7 +23,7 @@ my $cmd = $ENV{SSH_ORIGINAL_COMMAND};
+ # the second parameter.
+ # Further parameters are not validated here (see below).
+ die \"bad git-annex-shell command: $cmd\"
+-  unless $cmd =~ m#^(git-annex-shell '\w+' ')/(?:\~\/)?([0-9a-zA-Z][0-9a-zA-Z._\@/+-]*)('( .*|))$#;
++  unless $cmd =~ m#^(git-annex-shell '\w+' ')/\~/([0-9a-zA-Z][0-9a-zA-Z._\@/+-]*)('( .*|))$#;
+ my $start = $1;
+ my $repo  = $2;
+ my $end   = $3;
+
+
+References: http://git-annex.branchable.com/tips/using_gitolite_with_git-annex/#comment-16ee81f0d9e973ecb2fbb9d4a1fff261
+It was shown 3 years ago! I don't know why the bug it's still on. I'm using debian with:
+ - git-annex:
+  Installed: 5.20141024~bpo70+1
+ - gitolite3:
+  Installed: 3.6-1~bpo70+1
+"""]]