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

9 files changed, 97 insertions, 0 deletions

diff --git a/doc/bugs/git-annex_clears_files__39___og+r_permissions_when_rsync_transfer_is_interrupted_and_resumed/comment_2_992c1a51d0300bd676cb431688efa524._comment b/doc/bugs/git-annex_clears_files__39___og+r_permissions_when_rsync_transfer_is_interrupted_and_resumed/comment_2_992c1a51d0300bd676cb431688efa524._comment
new file mode 100644
index 000000000..f32a4a70f
--- /dev/null
+++ b/doc/bugs/git-annex_clears_files__39___og+r_permissions_when_rsync_transfer_is_interrupted_and_resumed/comment_2_992c1a51d0300bd676cb431688efa524._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog"
+ nickname="Michael"
+ subject="comment 2"
+ date="2014-04-17T21:19:10Z"
+ content="""
+Hi Joey,
+
+In fact, this is indirect mode on Linux, ext4.
+I'm less worried about preserving +x mode (though I can see why it would be useful). Here I'm referring to plain \"group\" and \"other\" read permissions being cleared.
+
+And I just did a test with a standalone rsync, using rsync -P localhost:file file2 and interrupting it, the partial (and final after resume) file2 still is 644 (and not 600 like in git-annex case).
+"""]]
diff --git a/doc/bugs/git-annex_clears_files__39___og+r_permissions_when_rsync_transfer_is_interrupted_and_resumed/comment_3_3001a11839eff6a4c3a9f12096b29704._comment b/doc/bugs/git-annex_clears_files__39___og+r_permissions_when_rsync_transfer_is_interrupted_and_resumed/comment_3_3001a11839eff6a4c3a9f12096b29704._comment
new file mode 100644
index 000000000..b365baa75
--- /dev/null
+++ b/doc/bugs/git-annex_clears_files__39___og+r_permissions_when_rsync_transfer_is_interrupted_and_resumed/comment_3_3001a11839eff6a4c3a9f12096b29704._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog"
+ nickname="Michael"
+ subject="comment 3"
+ date="2014-04-17T21:19:59Z"
+ content="""
+I think -p on non-crippled does make sense, and -E does too for crippled.
+"""]]
diff --git a/doc/bugs/git-annex_clears_files__39___og+r_permissions_when_rsync_transfer_is_interrupted_and_resumed/comment_4_a13abb45b9a94d275177641db0538765._comment b/doc/bugs/git-annex_clears_files__39___og+r_permissions_when_rsync_transfer_is_interrupted_and_resumed/comment_4_a13abb45b9a94d275177641db0538765._comment
new file mode 100644
index 000000000..919adc2e7
--- /dev/null
+++ b/doc/bugs/git-annex_clears_files__39___og+r_permissions_when_rsync_transfer_is_interrupted_and_resumed/comment_4_a13abb45b9a94d275177641db0538765._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog"
+ nickname="Michael"
+ subject="comment 4"
+ date="2014-04-17T21:22:16Z"
+ content="""
+s/and not 600/and not 400/
+
+In my ideal case I'd like to see indirect git-annex to set files to 444 (if umask in destination doesn't prevent that otherwise).
+"""]]
diff --git a/doc/bugs/git-annex_clears_files__39___og+r_permissions_when_rsync_transfer_is_interrupted_and_resumed/comment_5_faac2d48950307ce245f0da501ace730._comment b/doc/bugs/git-annex_clears_files__39___og+r_permissions_when_rsync_transfer_is_interrupted_and_resumed/comment_5_faac2d48950307ce245f0da501ace730._comment
new file mode 100644
index 000000000..57db29c8a
--- /dev/null
+++ b/doc/bugs/git-annex_clears_files__39___og+r_permissions_when_rsync_transfer_is_interrupted_and_resumed/comment_5_faac2d48950307ce245f0da501ace730._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog"
+ nickname="Michael"
+ subject="comment 5"
+ date="2014-04-17T21:32:35Z"
+ content="""
+core.sharedRepository does fix things here. Thanks Joey!
+I'm all set for my use case.
+"""]]
diff --git a/doc/bugs/git-annex_fails_to_initialize_under_Windows/comment_3_7aeeccd6c4bd97224980a2752e0f8ba8._comment b/doc/bugs/git-annex_fails_to_initialize_under_Windows/comment_3_7aeeccd6c4bd97224980a2752e0f8ba8._comment
new file mode 100644
index 000000000..aa4d513f8
--- /dev/null
+++ b/doc/bugs/git-annex_fails_to_initialize_under_Windows/comment_3_7aeeccd6c4bd97224980a2752e0f8ba8._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.191"
+ subject="comment 3"
+ date="2014-04-17T21:08:36Z"
+ content="""
+@ayutheos, can you confirm that running this git command fails the same way?
+
+git checkout -B annex/direct/master
+
+What version of git do you have installed?
+
+(Note to self: This checkout happens when enabling direct mode.. Works for me in a new git repo made on FAT. This repo does not have a .git/index file, and the error message \"fatal: index file open failed: Invalid argument\" comes from git when it tries to read the index file.)
+"""]]
diff --git a/doc/forum/Starting_assistant_from_CLI/comment_3_f7826867f78b1adbfc2dad2fad4d6720._comment b/doc/forum/Starting_assistant_from_CLI/comment_3_f7826867f78b1adbfc2dad2fad4d6720._comment
new file mode 100644
index 000000000..fbe70c403
--- /dev/null
+++ b/doc/forum/Starting_assistant_from_CLI/comment_3_f7826867f78b1adbfc2dad2fad4d6720._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.191"
+ subject="comment 3"
+ date="2014-04-17T20:48:56Z"
+ content="""
+Yes, the webapp is supposed to be able to be started from anywhere. 
+
+1. If you make a git annex repository and run `git annex webapp` from inside it, it'll start up the webapp on that repository. 
+2. If `~/.config/git-annex/autostart` lists some git repositories, the webapp will start up in the first listed one.
+3. Otherwise, the webapp will walk you through making a new repository.
+
+Most likely problem then is #2. If you used the webapp once, say in ~/annex and then deleted ~/annex/.git directory, it would try to start up in ~/annex, but it's no longer a git repository so it cannot start. This was a bug, so I've fixed it. 
+You could work around that problem by deleting `~/.config/git-annex/autostart` too.
+
+If it's some other problem, you can work around it by going the #1 route and making a git repository by hand (\"git init annex; cd annex; git annex init\") and running the webapp in there.
+"""]]
diff --git a/doc/forum/git_annex_assistant_-_Changing_repository_information/comment_1_cde71a410200a7478180748fdcde0352._comment b/doc/forum/git_annex_assistant_-_Changing_repository_information/comment_1_cde71a410200a7478180748fdcde0352._comment
new file mode 100644
index 000000000..fa0c61517
--- /dev/null
+++ b/doc/forum/git_annex_assistant_-_Changing_repository_information/comment_1_cde71a410200a7478180748fdcde0352._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.191"
+ subject="comment 1"
+ date="2014-04-17T20:59:43Z"
+ content="""
+This information is stored on the git-annex branch, and so it is synced between repositories with the rest of git-annex's data. You only need to change it in one place.. But it's also fine to change it in multiple places if necessary.
+"""]]
diff --git a/doc/tips/googledriveannex/comment_3_e7ba5620c0946874f0ae1287f99d1177._comment b/doc/tips/googledriveannex/comment_3_e7ba5620c0946874f0ae1287f99d1177._comment
new file mode 100644
index 000000000..c80dbf01f
--- /dev/null
+++ b/doc/tips/googledriveannex/comment_3_e7ba5620c0946874f0ae1287f99d1177._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.191"
+ subject="comment 3"
+ date="2014-04-17T20:58:41Z"
+ content="""
+@Mesut, I think you're doing everything right. It can take a long time for the highly secure gpg key to be generated. Sit tight and let it finish, or you can pass --fast to generate a key that is a tiny bit less secure.
+"""]]
diff --git a/doc/todo/LIst_of_Available_Remotes_in_Webapp/comment_1_23fe2f3cd44c4357a385452dcd5eedef._comment b/doc/todo/LIst_of_Available_Remotes_in_Webapp/comment_1_23fe2f3cd44c4357a385452dcd5eedef._comment
new file mode 100644
index 000000000..9e22dafca
--- /dev/null
+++ b/doc/todo/LIst_of_Available_Remotes_in_Webapp/comment_1_23fe2f3cd44c4357a385452dcd5eedef._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.191"
+ subject="comment 1"
+ date="2014-04-17T20:54:18Z"
+ content="""
+I chose to make the webapp only show available remotes when it knows how to enable them. So it will show S3 special remotes, Box.com special remotes, etc. This avoids cluttering up the display of a shared repository with a list of all of your friend's removable drives, for example.
+
+I would like to make the webapp smarter about handling repositories on remote ssh servers. As long as the server name is in the global DNS, the webapp could easily walk the user through setting up such a remote. The missing piece is that nothing is logged in remotes.log for these remotes, and so the assistant doesn't know the server name.
+"""]]