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

13 files changed, 152 insertions, 5 deletions

diff --git a/doc/bugs/git-annex_auto_upgrade_is_redundant.mdwn b/doc/bugs/git-annex_auto_upgrade_is_redundant.mdwn
new file mode 100644
index 000000000..3c6c25854
--- /dev/null
+++ b/doc/bugs/git-annex_auto_upgrade_is_redundant.mdwn
@@ -0,0 +1,26 @@
+### Please describe the problem.
+
+Hi,
+
+On OSX the web-app keeps notifying me of an upgrade, I choose to run it but nothing seems to happen.
+
+The debug logs show that the upgrade is skipped as it's redundant.
+
+### What steps will reproduce the problem?
+
+Have upgrades set to notify.
+
+### What version of git-annex are you using? On what operating system?
+
+Current.
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+[2014-04-25 08:26:30 BST] Upgrader: An upgrade of git-annex is available.  (version 5.20140421)
+[2014-04-25 08:27:02 BST] main: Skipping redundant upgrade
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/git-annex_auto_upgrade_is_redundant/comment_1_67cdbedc70695d1e4be81e59ab9b87bd._comment b/doc/bugs/git-annex_auto_upgrade_is_redundant/comment_1_67cdbedc70695d1e4be81e59ab9b87bd._comment
new file mode 100644
index 000000000..be27aa0d9
--- /dev/null
+++ b/doc/bugs/git-annex_auto_upgrade_is_redundant/comment_1_67cdbedc70695d1e4be81e59ab9b87bd._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU"
+ nickname="Matt"
+ subject="comment 1"
+ date="2014-04-25T07:36:09Z"
+ content="""
+The upgrade notifications seem to appear when switching between repositories in the web-app - are repositories treated separately?  Or perhaps notifications sent per repo?
+
+"""]]
diff --git a/doc/bugs/git-annex_auto_upgrade_is_redundant/comment_2_3a8041ce622b9288261fab57ecb87c28._comment b/doc/bugs/git-annex_auto_upgrade_is_redundant/comment_2_3a8041ce622b9288261fab57ecb87c28._comment
new file mode 100644
index 000000000..1b4c0505d
--- /dev/null
+++ b/doc/bugs/git-annex_auto_upgrade_is_redundant/comment_2_3a8041ce622b9288261fab57ecb87c28._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ ip="72.0.72.144"
+ subject="comment 2"
+ date="2014-04-25T13:25:43Z"
+ content="""
+i think this problem was quickly mentionned in [[devblog/day_157__upgrade_checking]], can you provide a full debug log?
+"""]]
diff --git a/doc/bugs/git-annex_fails_to_initialize_under_Windows_with_cygwin.mdwn b/doc/bugs/git-annex_fails_to_initialize_under_Windows_with_cygwin.mdwn
new file mode 100644
index 000000000..4b3eda613
--- /dev/null
+++ b/doc/bugs/git-annex_fails_to_initialize_under_Windows_with_cygwin.mdwn
@@ -0,0 +1,38 @@
+### Please describe the problem.
+
+
+### What steps will reproduce the problem?
+
+$ git init                                                                                             
+Initialized empty Git repository in /cygdrive/c/Temp/.git/                                             
+                                                                                                       
+$ git-annex init                                                                                       
+init                                                                                                   
+  Detected a filesystem without fifo support.                                                          
+                                                                                                       
+  Disabling ssh connection caching.                                                                    
+                                                                                                       
+  Detected a crippled filesystem.                                                                      
+                                                                                                       
+  Disabling core.symlinks.                                                                             
+                                                                                                       
+  Enabling direct mode.                                                                                
+fatal: You are on a branch yet to be born                                                              
+git-annex.exe: git [Param "checkout",Param "-q",Param "-B",Param "annex/direct/master"] failed         
+                                                                                                       
+$ git checkout -B annex/direct/master                                                                  
+fatal: You are on a branch yet to be born                                                              
+
+### What version of git-annex are you using? On what operating system?
+
+Running under cygwin bash
+
+$ git --version
+git version 1.7.9
+
+$ git-annex version
+git-annex version: 5.20140421-g78d6aa1
+build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV DNS Feeds Quvi TDFA CryptoHash
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
+
diff --git a/doc/bugs/git-annex_remotedeamon/comment_2_82f71852df61d12333d08ba25af9d7be._comment b/doc/bugs/git-annex_remotedeamon/comment_2_82f71852df61d12333d08ba25af9d7be._comment
new file mode 100644
index 000000000..0228e2fbb
--- /dev/null
+++ b/doc/bugs/git-annex_remotedeamon/comment_2_82f71852df61d12333d08ba25af9d7be._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU"
+ nickname="Matt"
+ subject="comment 2"
+ date="2014-04-24T18:43:50Z"
+ content="""
+hmmm - I think that it's arguable that if in the repository group drop down I select \"client\" then the remote repo should *not* be bare.
+
+I would predict that this new functionality will supercede the existing use-cases in terms of popularity.  It's very cool that all my machines can be kept in sync with just ssh - a walkthrough showing desktop, laptop, and phone all just syncing (i.e., without the cloud transfer repo and jabber complications) makes a much simpler and compelling advert for this cool code!  But it won't happen unless the GUI supports it...
+"""]]
diff --git a/doc/forum/Checking_for_missing_files_in_S3___40__reduced_redundancy__41__/comment_2_793b3d9f78562f3aecf27dd926bbcf82._comment b/doc/forum/Checking_for_missing_files_in_S3___40__reduced_redundancy__41__/comment_2_793b3d9f78562f3aecf27dd926bbcf82._comment
new file mode 100644
index 000000000..404ba8b87
--- /dev/null
+++ b/doc/forum/Checking_for_missing_files_in_S3___40__reduced_redundancy__41__/comment_2_793b3d9f78562f3aecf27dd926bbcf82._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.114"
+ subject="comment 2"
+ date="2014-04-24T18:12:59Z"
+ content="""
+git annex fsck --fast --from $yours3remote
+"""]]
diff --git a/doc/forum/Checkout_only_some_files_with_the_assistant/comment_1_23d8ab1a05e3e9d3611bd12a4ba70b0c._comment b/doc/forum/Checkout_only_some_files_with_the_assistant/comment_1_23d8ab1a05e3e9d3611bd12a4ba70b0c._comment
new file mode 100644
index 000000000..85325c60c
--- /dev/null
+++ b/doc/forum/Checkout_only_some_files_with_the_assistant/comment_1_23d8ab1a05e3e9d3611bd12a4ba70b0c._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.114"
+ subject="comment 1"
+ date="2014-04-24T18:15:15Z"
+ content="""
+[[preferred_content]] expressions can be used to do that. Works best if all the files you want have some extension or are in a specific directory.
+
+There are some [[preferred_content/standard_groups]] that might do what you want, particularly the \"manual\" one.
+"""]]
diff --git a/doc/forum/Encrypted_Content_Remote_Daemon_.mdwn b/doc/forum/Encrypted_Content_Remote_Daemon_.mdwn
new file mode 100644
index 000000000..614d27688
--- /dev/null
+++ b/doc/forum/Encrypted_Content_Remote_Daemon_.mdwn
@@ -0,0 +1 @@
+I am currently using rsync.net to keep my notes in sync, both git repo and the content (gpg encrypted) is stored there. Instead of creating two other repos on a server that I have which has git-annex installed where I can actually use remote daemon. Is it possible to create a repo containing both the git repo and the content encrypted from the command line?
diff --git a/doc/forum/sync_stages_deletions_on_remote/comment_4_e5a3dc34c6229ec40bc999c3cab28041._comment b/doc/forum/sync_stages_deletions_on_remote/comment_4_e5a3dc34c6229ec40bc999c3cab28041._comment
new file mode 100644
index 000000000..710392daa
--- /dev/null
+++ b/doc/forum/sync_stages_deletions_on_remote/comment_4_e5a3dc34c6229ec40bc999c3cab28041._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.114"
+ subject="comment 4"
+ date="2014-04-24T18:22:16Z"
+ content="""
+git sets bare = false in newly created non-bare repositories. Perhaps this is why? It seems likely that git has an inconsistent default if there's no configuration. Sounds worth filing a bug on git for. OTOH, messing with .git/config  in nonstandard ways seems like a good way to cause yourself random pain too.
+"""]]
diff --git a/doc/sync/comment_12_2fea14fa314ddb7ab645a5cca5a95fd9._comment b/doc/sync/comment_12_2fea14fa314ddb7ab645a5cca5a95fd9._comment
new file mode 100644
index 000000000..b7e2ea189
--- /dev/null
+++ b/doc/sync/comment_12_2fea14fa314ddb7ab645a5cca5a95fd9._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://mshri.livejournal.com/"
+ ip="129.170.212.202"
+ subject="Sync specific branch or ignore a branch during sync"
+ date="2014-04-25T15:37:53Z"
+ content="""
+
+I too feel that syncing all remotes by default is the right thing to do, but I think it should be limited to the 'master' and 'git-annex' branch. I often create branches that I want to keep local and do not want them to be synced. But I want 'master' and 'git-annex' branches to be synced with all remotes.
+
+So it would be nice to able to set an option to sync all branches or just the 'master' and 'git-annex' or to able to ignore some branches during git annex sync
+
+Shri
+
+"""]]
diff --git a/doc/todo/wishlist:_git_annex_group_remote_return_the_group.mdwn b/doc/todo/wishlist:_git_annex_group_remote_return_the_group.mdwn
new file mode 100644
index 000000000..ace9842ee
--- /dev/null
+++ b/doc/todo/wishlist:_git_annex_group_remote_return_the_group.mdwn
@@ -0,0 +1,9 @@
+Hi,
+
+It would be good if the command 
+
+    git annex group repository
+
+returned the current list of groups the repository belongs to...(can it belong to more than one?)
+
+Currently the command requires an additional parameter to set the group.
diff --git a/doc/todo/wishlist:_turn_a_directory_into_a_git-annex_direct_repository.mdwn b/doc/todo/wishlist:_turn_a_directory_into_a_git-annex_direct_repository.mdwn
index af646e403..c15dca727 100644
--- a/doc/todo/wishlist:_turn_a_directory_into_a_git-annex_direct_repository.mdwn
+++ b/doc/todo/wishlist:_turn_a_directory_into_a_git-annex_direct_repository.mdwn
@@ -11,10 +11,8 @@ This is the use case:
 
 What I would like to have a command that turns that directory into a direct repository without dealing with the gory details I will describe later. This command could be something like
 
-```
-$ cd Documents
-$ git annex setup --direct example.org:~/annex/Documents.git
-```
+    $ cd Documents
+    $ git annex setup --direct example.org:~/annex/Documents.git
 
 This command should take care of:
 
@@ -25,4 +23,4 @@ This command should take care of:
 
 These are just the main problems that one faces in this task; they are mostly caused by the fact that the repo is in direct mode.
 
-There are workarounds, like those sketched at <http://unix.stackexchange.com/questions/75557/init-gix-annex-additional-repo-with-existing-files>, but the all are time-consuming and fragile.
+There are workarounds, like those sketched at <http://unix.stackexchange.com/questions/75557/init-gix-annex-additional-repo-with-existing-files>, but they are all time-consuming and fragile.
diff --git a/doc/todo/wishlist:_turn_a_directory_into_a_git-annex_direct_repository/comment_1_d48a98bad77400bd8384300e324d999f._comment b/doc/todo/wishlist:_turn_a_directory_into_a_git-annex_direct_repository/comment_1_d48a98bad77400bd8384300e324d999f._comment
new file mode 100644
index 000000000..ff173347f
--- /dev/null
+++ b/doc/todo/wishlist:_turn_a_directory_into_a_git-annex_direct_repository/comment_1_d48a98bad77400bd8384300e324d999f._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ ip="72.0.72.144"
+ subject="comment 1"
+ date="2014-04-25T13:28:18Z"
+ content="""
+take a look at [[tips/migrating_two_seperate_disconnected_directories_to_git_annex]]. it's not a single command, granted, but it should be simple enough for your use case...
+"""]]