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

3 files changed, 49 insertions, 0 deletions

diff --git a/doc/bugs/Using_Github_as_remote_throws_proxy_errors.mdwn b/doc/bugs/Using_Github_as_remote_throws_proxy_errors.mdwn
new file mode 100644
index 000000000..a05edcb69
--- /dev/null
+++ b/doc/bugs/Using_Github_as_remote_throws_proxy_errors.mdwn
@@ -0,0 +1,25 @@
+What steps will reproduce the problem?
+
+1. cd to an already existing git repository that uses Github as a remote, with the remote format similar to git@github.com:user/repo.git
+2. git annex init
+3. git annex status
+
+What is the expected output? What do you see instead?
+
+    $ git annex status
+    supported backends: SHA256 SHA1 SHA512 SHA224 SHA384 SHA256E SHA1E SHA512E SHA224E SHA384E WORM URL
+    supported remote types: git S3 bup directory rsync web hook
+    trusted repositories: Invalid command: 'git-annex-shell 'configlist' '/~/dlo/objectifier.git''
+      You appear to be using ssh to clone a git:// URL.
+      Make sure your core.gitProxy config option and the
+      GIT_PROXY_COMMAND environment variable are NOT set.
+    Command ssh ["-S","/Users/dan/Documents/Web/objectifier/.git/annex/ssh/git@github.com","-o","ControlMaster=auto","-o","ControlPersist=yes","git@github.com","git-annex-shell 'configlist' '/~/dlo/objectifier.git'"] failed; exit code 1
+    0
+    # ... other stuff that isn't relevant
+
+
+What version of git-annex are you using? On what operating system?
+
+git-annex-3.20120825
+
+Max OS X 10.8.1
diff --git a/doc/bugs/Using_Github_as_remote_throws_proxy_errors/comment_1_10616b17c3fb8286fdc64c841023f8a1._comment b/doc/bugs/Using_Github_as_remote_throws_proxy_errors/comment_1_10616b17c3fb8286fdc64c841023f8a1._comment
new file mode 100644
index 000000000..77ebcaa1a
--- /dev/null
+++ b/doc/bugs/Using_Github_as_remote_throws_proxy_errors/comment_1_10616b17c3fb8286fdc64c841023f8a1._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.153.14.141"
+ subject="comment 1"
+ date="2012-09-24T17:24:47Z"
+ content="""
+The proxy message is sent from github, so I can't do anything about that. `git@github.com:user/repo.git` is a ssh url, so git-annex tries to use it as a full git-annex remote. If you use a git:// url, git-annex will
+skip it. Or you can set `git config remote.origin.annex-ignore true` (replace origin with the name of the github remote).
+"""]]
diff --git a/doc/design/assistant/transfer_control/comment_1_d5adaef4712913dc0263d4ebafb79320._comment b/doc/design/assistant/transfer_control/comment_1_d5adaef4712913dc0263d4ebafb79320._comment
new file mode 100644
index 000000000..54e6a59cc
--- /dev/null
+++ b/doc/design/assistant/transfer_control/comment_1_d5adaef4712913dc0263d4ebafb79320._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
+ nickname="Richard"
+ subject="comment 1"
+ date="2012-09-23T21:58:08Z"
+ content="""
+You could try to do it similar to [RT](http://bestpractical.com/rt/):
+
+* Implement saved statements, i.e. offer common use cases
+* Allow those statements (or aliases? stanzas?) to be loaded in a relatively simple editor with a basic wizard to support the building of new rules
+* Offer a free-text input for advanced users. It should be able to parse that and load it into the simple editor.
+* Users should be able to save, export, and import those statements.
+* Optionally, allow users to dry run the rules by showing them what git-annex needs to do to fulfill the requirements set by the statements.
+
+"""]]