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

20 files changed, 276 insertions, 1 deletions

diff --git a/doc/assistant/comment_5_d17de359cdd46659170d373cd09c0979._comment b/doc/assistant/comment_5_d17de359cdd46659170d373cd09c0979._comment
new file mode 100644
index 000000000..27d343021
--- /dev/null
+++ b/doc/assistant/comment_5_d17de359cdd46659170d373cd09c0979._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 5"
+ date="2014-05-16T18:55:22Z"
+ content="""
+If you have a question about using the assistant, please ask it in the [[forum]], not here.
+"""]]
diff --git a/doc/bugs/MAC_OSX_git-annex:___47__etc__47__resolv.conf:_openFile:_does_not_exist___40__No_such_file_or_directory__41__/comment_1_6e50d721c624ad82e94c8e5e93b38783._comment b/doc/bugs/MAC_OSX_git-annex:___47__etc__47__resolv.conf:_openFile:_does_not_exist___40__No_such_file_or_directory__41__/comment_1_6e50d721c624ad82e94c8e5e93b38783._comment
new file mode 100644
index 000000000..be0c21eee
--- /dev/null
+++ b/doc/bugs/MAC_OSX_git-annex:___47__etc__47__resolv.conf:_openFile:_does_not_exist___40__No_such_file_or_directory__41__/comment_1_6e50d721c624ad82e94c8e5e93b38783._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T18:00:53Z"
+ content="""
+Based on the comments in <http://git-annex.branchable.com/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./>
+it seems that this system does have a /etc/resolv.conf.
+
+I'm left wondering if perhaps the file was briefly missing. For example, perhaps when moving between networks.
+
+Did git-annex break in some way? Is it working now with the file present?
+"""]]
diff --git a/doc/bugs/MAC_OSX_git-annex:___47__etc__47__resolv.conf:_openFile:_does_not_exist___40__No_such_file_or_directory__41__/comment_2_07a22d9e9010a04ae0088ebfd4bbf4df._comment b/doc/bugs/MAC_OSX_git-annex:___47__etc__47__resolv.conf:_openFile:_does_not_exist___40__No_such_file_or_directory__41__/comment_2_07a22d9e9010a04ae0088ebfd4bbf4df._comment
new file mode 100644
index 000000000..c578d3c03
--- /dev/null
+++ b/doc/bugs/MAC_OSX_git-annex:___47__etc__47__resolv.conf:_openFile:_does_not_exist___40__No_such_file_or_directory__41__/comment_2_07a22d9e9010a04ae0088ebfd4bbf4df._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="comment 2"
+ date="2014-05-16T18:11:02Z"
+ content="""
+Ah, that theory was right. I unplugged my iphone thus cutting my internet off, and the file is gone indeed.
+Does that mean we can ignore this problem? I'm only sporadically online via internet cafes and to check emails at night via iphone.
+
+Can't say whether git annex is working or not, still trying to figure out how it all works so I have only put a relatively small folder into the local repo and created a full backup S3 repo as well as an archive one on box.com
+"""]]
diff --git a/doc/bugs/MAC_OSX_git-annex:___47__etc__47__resolv.conf:_openFile:_does_not_exist___40__No_such_file_or_directory__41__/comment_3_0b64e2dada87cd79fa584e86a00529ea._comment b/doc/bugs/MAC_OSX_git-annex:___47__etc__47__resolv.conf:_openFile:_does_not_exist___40__No_such_file_or_directory__41__/comment_3_0b64e2dada87cd79fa584e86a00529ea._comment
new file mode 100644
index 000000000..c27132892
--- /dev/null
+++ b/doc/bugs/MAC_OSX_git-annex:___47__etc__47__resolv.conf:_openFile:_does_not_exist___40__No_such_file_or_directory__41__/comment_3_0b64e2dada87cd79fa584e86a00529ea._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 3"
+ date="2014-05-16T18:25:29Z"
+ content="""
+Yes, that makes sense. /etc/resolv.conf is only used when trying to access the network, so if the network is not up, nothing is going to fail that wouldn't fail anyway. And git-annex should retry everything at a later point, when the network is up.
+"""]]
diff --git a/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_5_cd9b77e6670840a9902f5be80e1e658a._comment b/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_5_cd9b77e6670840a9902f5be80e1e658a._comment
new file mode 100644
index 000000000..8320e53a2
--- /dev/null
+++ b/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_5_cd9b77e6670840a9902f5be80e1e658a._comment
@@ -0,0 +1,87 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="comment 5"
+ date="2014-05-16T17:45:48Z"
+ content="""
+I gave up on this. After doing this a few times, I stopped. Living in Africa, bandwidth is really expensive :-/ 
+
+Initially I installed via the downloaded .dmg file. 
+After poking around a few times, I found a folder inside my Applications folder:
+
+    ls -al /Applications/gi*
+    /Applications/git-annex.app:
+    total 0
+    drwxr-xr-x@   3 ovi   admin   102 May 12 13:10 .
+    drwxrwxr-x+ 155 root  admin  5270 May 15 04:19 ..
+    drwxr-xr-x    5 ovi   admin   170 May  9 15:45 Contents
+
+    /Applications/git-annex.app.5.20140421:
+    total 0
+    drwxr-xr-x    2 ovi   admin    68 May 11 11:26 .
+    drwxrwxr-x+ 155 root  admin  5270 May 15 04:19 ..
+
+Every time I now open git-annex assistant I am greeted with: 
+
+    An upgrade of git-annex is available.
+    (version 5.20140421)
+
+I just did it again and it starts downloading again arrrghh!
+
+    Transfers
+    git-annex.dmg (for upgrade)←web 12% of 22.52 MiB
+
+restarted the assistant and it now says: 
+
+    Finished upgrading git-annex to version 5.20140420-ga25b8bb
+
+Then I check and find this:
+
+ls -al /Applications/gi*
+/Applications/git-annex.app:
+total 0
+drwxr-xr-x@   3 ovi   admin   102 May 12 13:10 .
+drwxrwxr-x+ 155 root  admin  5270 May 15 04:19 ..
+drwxr-xr-x    5 ovi   admin   170 May  9 15:45 Contents
+
+/Applications/git-annex.app.5.20140421:
+total 0
+drwxr-xr-x    2 ovi   admin    68 May 11 11:26 .
+drwxrwxr-x+ 155 root  admin  5270 May 15 04:19 ..
+shiny-2:~ ovi$ ls -al /Applications/gi*
+/Applications/git-annex.app:
+total 0
+drwxr-xr-x@   3 ovi   admin   102 May 12 13:10 .
+drwxrwxr-x+ 155 root  admin  5270 May 15 04:19 ..
+drwxr-xr-x    5 ovi   admin   170 May  9 15:45 Contents
+
+/Applications/git-annex.app.5.20140421:
+total 0
+drwxr-xr-x    2 ovi   admin    68 May 11 11:26 .
+drwxrwxr-x+ 155 root  admin  5270 May 15 04:19 ..
+
+LOL. restarting the assistant am greeted with click here to finish the upgrade. did so.
+
+now only 2 folders not 3 left:
+
+ls -al /Applications/gi*
+/Applications/git-annex.app:
+total 0
+drwxr-xr-x@   3 ovi   admin   102 May 12 13:10 .
+drwxrwxr-x+ 155 root  admin  5270 May 15 04:19 ..
+drwxr-xr-x    5 ovi   admin   170 May  9 15:45 Contents
+
+/Applications/git-annex.app.5.20140421:
+total 0
+drwxr-xr-x    2 ovi   admin    68 May 11 11:26 .
+drwxrwxr-x+ 155 root  admin  5270 May 15 04:19 ..
+
+Started the asistant again, am greeted with:
+
+ An upgrade of git-annex is available.
+(version 5.20140421)
+
+Thank you very much... not going to downlaod it again...
+
+COULD YOU PLEASE JUST SHARE THE DOWNLOAD LINK TO THE NEWEST ONE?
+"""]]
diff --git a/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_6_4584393333d377532d8607b42319abd9._comment b/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_6_4584393333d377532d8607b42319abd9._comment
new file mode 100644
index 000000000..023ccebfe
--- /dev/null
+++ b/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_6_4584393333d377532d8607b42319abd9._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="failed upgrade log file"
+ date="2014-05-16T17:55:34Z"
+ content="""
+Just in case it helps diagnose the problem: http://pastebin.com/PUpPRURb
+"""]]
diff --git a/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_7_d9d36ff62267dde98a27c5981951df7f._comment b/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_7_d9d36ff62267dde98a27c5981951df7f._comment
new file mode 100644
index 000000000..b38502bf4
--- /dev/null
+++ b/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_7_d9d36ff62267dde98a27c5981951df7f._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 7"
+ date="2014-05-16T17:57:13Z"
+ content="""
+The repeated attempts to upgrade to 21 when it only downloads 20 are due to a different bug: [[bugs/git-annex_auto_upgrade_is_redundant]]. I've just put in a quick fix that should avoid that.
+
+However, for the purposes of this bug report, I'm interested in the original problem of \"Cannot find old distribution bundle; not upgrading\", and to fix that, I need to know how you originally installed git-annex.
+"""]]
diff --git a/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_8_5b26711c737eeb0b302060f098cb320b._comment b/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_8_5b26711c737eeb0b302060f098cb320b._comment
new file mode 100644
index 000000000..b2cab6097
--- /dev/null
+++ b/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_8_5b26711c737eeb0b302060f098cb320b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="comment 8"
+ date="2014-05-16T17:59:13Z"
+ content="""
+download 20.dmg, double clicked it, dragged it into my Applications folder.
+"""]]
diff --git a/doc/bugs/git-annex_auto_upgrade_is_redundant/comment_7_85e8a286d6b1ec5212614c36bf54addb._comment b/doc/bugs/git-annex_auto_upgrade_is_redundant/comment_7_85e8a286d6b1ec5212614c36bf54addb._comment
new file mode 100644
index 000000000..3586aca7f
--- /dev/null
+++ b/doc/bugs/git-annex_auto_upgrade_is_redundant/comment_7_85e8a286d6b1ec5212614c36bf54addb._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 7"
+ date="2014-05-16T17:54:38Z"
+ content="""
+I've temporarily worked around this by updating the .info file for OSX to have the right version number.
+
+I think that my release process generally manages to avoid version skew, but not always. And it's most likely to happen for OSX since that autobuilder only runs once per day. 
+"""]]
diff --git a/doc/bugs/git-annex_auto_upgrade_is_redundant/comment_8_2b2152844612d83f295a5de02f6ed3e7._comment b/doc/bugs/git-annex_auto_upgrade_is_redundant/comment_8_2b2152844612d83f295a5de02f6ed3e7._comment
new file mode 100644
index 000000000..9dc7257fa
--- /dev/null
+++ b/doc/bugs/git-annex_auto_upgrade_is_redundant/comment_8_2b2152844612d83f295a5de02f6ed3e7._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="comment 8"
+ date="2014-05-16T18:00:18Z"
+ content="""
+So what do we as end-users do to get the latest version now? Re-download?
+"""]]
diff --git a/doc/bugs/git-annex_group_remote_allows_bad_settings_with_standard_groups/comment_1_b3090201e90a78e049cf299fc322d60e._comment b/doc/bugs/git-annex_group_remote_allows_bad_settings_with_standard_groups/comment_1_b3090201e90a78e049cf299fc322d60e._comment
new file mode 100644
index 000000000..154bcd12e
--- /dev/null
+++ b/doc/bugs/git-annex_group_remote_allows_bad_settings_with_standard_groups/comment_1_b3090201e90a78e049cf299fc322d60e._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T18:34:49Z"
+ content="""
+You can get the same effect by running `git annex vicfg` in 2 repositories at the same time, and adding different groups. When the repositories sync and merge, things end up in 2 groups.
+
+So, this is something that git-annex has to deal with being done, even if the configuration does not make sense. It deals with it by treating such a configuration the same as if the repository was in no groups, as far as preferred content is concerned.
+
+So, I don't see much point in adding configuration time checks, since they'd not catch all ways this can happen.
+"""]]
diff --git a/doc/bugs/no_git-annex_shell_on_Windows/comment_1_988768c3e4f30c751034a0b0390cdd88._comment b/doc/bugs/no_git-annex_shell_on_Windows/comment_1_988768c3e4f30c751034a0b0390cdd88._comment
new file mode 100644
index 000000000..fc58c35dd
--- /dev/null
+++ b/doc/bugs/no_git-annex_shell_on_Windows/comment_1_988768c3e4f30c751034a0b0390cdd88._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T18:12:34Z"
+ content="""
+You should be able to copy git-annex.exe to git-annex-shell.exe and that will be usable as git-annex-shell. I could make the windows installer do this, but without the ability to easily hard or symlink the files, it would double the disk space for what seems an unusual use case..
+"""]]
diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn
index 6d5a07ee3..4274c9928 100644
--- a/doc/design/assistant/polls/Android_default_directory.mdwn
+++ b/doc/design/assistant/polls/Android_default_directory.mdwn
@@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they
 want the first time they run it, but to save typing on android, anything
 that gets enough votes will be included in a list of choices as well.
 
-[[!poll open=yes expandable=yes 66 "/sdcard/annex" 6 "Whole /sdcard" 7 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
+[[!poll open=yes expandable=yes 67 "/sdcard/annex" 6 "Whole /sdcard" 7 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
diff --git a/doc/forum/How_to_change_the_name_of_a_repo_on_S3__63__/comment_2_d54a7163cfe9a94b7ba337860958e5c5._comment b/doc/forum/How_to_change_the_name_of_a_repo_on_S3__63__/comment_2_d54a7163cfe9a94b7ba337860958e5c5._comment
new file mode 100644
index 000000000..d563d061a
--- /dev/null
+++ b/doc/forum/How_to_change_the_name_of_a_repo_on_S3__63__/comment_2_d54a7163cfe9a94b7ba337860958e5c5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="comment 2"
+ date="2014-05-16T18:08:11Z"
+ content="""
+Thanks but I realized there's no way to rename an S3 bucket so giving up on this idea...
+"""]]
diff --git a/doc/forum/Special_remote_public_key_encryption_issue/comment_1_a9caafea017a3c148f89d4ddeee15a4c._comment b/doc/forum/Special_remote_public_key_encryption_issue/comment_1_a9caafea017a3c148f89d4ddeee15a4c._comment
new file mode 100644
index 000000000..6c5a35c3a
--- /dev/null
+++ b/doc/forum/Special_remote_public_key_encryption_issue/comment_1_a9caafea017a3c148f89d4ddeee15a4c._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T18:22:26Z"
+ content="""
+Which is why the assistant uses shared encryption by default..
+
+You have set up a webdav repository using a gpg key that is on computer 1. To be able to access this repository on computer 2 you'll need to either copy the gpg private key from computer 1, or give computer 2 its own key and, on computer 1, add that key as one that can access the webdav repository.
+"""]]
diff --git a/doc/forum/Storing_git_repos_in_git-annex/comment_9_d5676400e7148b7d3408f2bdb3d54b7d._comment b/doc/forum/Storing_git_repos_in_git-annex/comment_9_d5676400e7148b7d3408f2bdb3d54b7d._comment
new file mode 100644
index 000000000..23610fa71
--- /dev/null
+++ b/doc/forum/Storing_git_repos_in_git-annex/comment_9_d5676400e7148b7d3408f2bdb3d54b7d._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnaYy6kTuKAHmsa4BtGls2oqa42Jo2w2v0"
+ nickname="Pere"
+ subject="So, you are more clever than your users, isn't?"
+ date="2014-05-16T18:13:34Z"
+ content="""
+Joey, your comment is really disappointing. I also use Dropbox as a central git repo and it works great for me. Maybe you find this stupid, but there is a lot of people with good reasons to do so. I agree that this is your software project, thus you have the right not to support this use case, but you don't have the right to treat the users that want this feature as you did in your comment. Next time you do a new crowdfunding campaign, I not sure I'll be between the donors again.
+"""]]
diff --git a/doc/special_remotes/webdav/comment_11_cde4fccaf551ba1eab8235ebf6654316._comment b/doc/special_remotes/webdav/comment_11_cde4fccaf551ba1eab8235ebf6654316._comment
new file mode 100644
index 000000000..267fc3580
--- /dev/null
+++ b/doc/special_remotes/webdav/comment_11_cde4fccaf551ba1eab8235ebf6654316._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 11"
+ date="2014-05-16T18:19:21Z"
+ content="""
+You can change the webdav password by running:
+
+WEBDAV_USERNAME=whatever WEBDAV_PASSWORD=newpassword git annex enableremote $remotename
+"""]]
diff --git a/doc/tips/skydriveannex/comment_3_8b9444006734262693f71e50a40eae1d._comment b/doc/tips/skydriveannex/comment_3_8b9444006734262693f71e50a40eae1d._comment
new file mode 100644
index 000000000..892462cb3
--- /dev/null
+++ b/doc/tips/skydriveannex/comment_3_8b9444006734262693f71e50a40eae1d._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="Hitting trouble"
+ date="2014-05-16T17:49:59Z"
+ content="""
+    shiny-2:skydriveannex ovi$ git annex initremote skydrive type=external externaltype=skydrive encryption=shared folder=git-annex
+    git-annex: First run: git-annex init
+    shiny-2:skydriveannex ovi$
+
+Above wasn't mentioned in the tutorial so I tried it:
+
+    shiny-2:skydriveannex ovi$ git-annex init
+    init  ok
+    (Recording state in git...)
+    shiny-2:skydriveannex ovi$
+
+What now? Never got asked about any OAUTH...
+"""]]
diff --git a/doc/tips/skydriveannex/comment_4_8b01dc6ca1082a8c24ff65fec9d759d8._comment b/doc/tips/skydriveannex/comment_4_8b01dc6ca1082a8c24ff65fec9d759d8._comment
new file mode 100644
index 000000000..7edc9d414
--- /dev/null
+++ b/doc/tips/skydriveannex/comment_4_8b01dc6ca1082a8c24ff65fec9d759d8._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="comment 4"
+ date="2014-05-16T17:51:29Z"
+ content="""
+And no link was opened automatically
+"""]]
diff --git a/doc/todo/read-only_removable_drives/comment_1_979455e3694ae2403134ed6fa2add2fa._comment b/doc/todo/read-only_removable_drives/comment_1_979455e3694ae2403134ed6fa2add2fa._comment
new file mode 100644
index 000000000..ac98d6845
--- /dev/null
+++ b/doc/todo/read-only_removable_drives/comment_1_979455e3694ae2403134ed6fa2add2fa._comment
@@ -0,0 +1,21 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T18:10:28Z"
+ content="""
+The assistant ignores drives that it cannot write to. This is a very good heuristic to avoid listing every special device in linux, OSX, etc as possible removable drives. I don't think it makes sense for the assistant to try to handle this use case.
+
+Is there some problem using git-annex at the command line with a remote that is read-only? I don't see any problem in my tests.
+
+<pre>
+joey@darkstar:~/tmp/r>git annex drop
+drop foo ok
+(Recording state in git...)
+joey@darkstar:~/tmp/r>ls -ld ../readonly
+drwxr-xr-x 3 root root 4096 May 16 14:08 ../readonly/
+joey@darkstar:~/tmp/r>git annex get --from readonly
+get foo (from readonly...) ok
+(Recording state in git...)
+</pre>
+"""]]