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

5 files changed, 172 insertions, 0 deletions

diff --git a/doc/bugs/Assistant_will_annex_your_files_on_startup_if_you_create_a_repository_in___126____47__/comment_3_a29edaf9110cc6e0ed68f92d33ed7735._comment b/doc/bugs/Assistant_will_annex_your_files_on_startup_if_you_create_a_repository_in___126____47__/comment_3_a29edaf9110cc6e0ed68f92d33ed7735._comment
new file mode 100644
index 000000000..ffdda0bc6
--- /dev/null
+++ b/doc/bugs/Assistant_will_annex_your_files_on_startup_if_you_create_a_repository_in___126____47__/comment_3_a29edaf9110cc6e0ed68f92d33ed7735._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991"
+ nickname="timothyhobbs"
+ subject="comment 3"
+ date="2016-04-05T21:28:20Z"
+ content="""
+If I understand correctly, than if you run the command `git annex webapp` and the $PWD is a git annex repository, then this will start the assistant and annex all of the files in that directory. And that, I think is a bug, no one expects the `webapp` command to do anything besides display a GUI.
+"""]]
diff --git a/doc/bugs/Assistant_will_annex_your_files_on_startup_if_you_create_a_repository_in___126____47__/comment_4_6353daafdf250ea0c4dad1e2fd1233a3._comment b/doc/bugs/Assistant_will_annex_your_files_on_startup_if_you_create_a_repository_in___126____47__/comment_4_6353daafdf250ea0c4dad1e2fd1233a3._comment
new file mode 100644
index 000000000..77cbad403
--- /dev/null
+++ b/doc/bugs/Assistant_will_annex_your_files_on_startup_if_you_create_a_repository_in___126____47__/comment_4_6353daafdf250ea0c4dad1e2fd1233a3._comment
@@ -0,0 +1,27 @@
+[[!comment format=mdwn
+ username="timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991"
+ nickname="timothyhobbs"
+ subject="comment 4"
+ date="2016-04-05T22:29:06Z"
+ content="""
+Yes, that is the problem. Try:
+
+````
+$ mkdir foo
+$ cd foo
+$ echo foo > bar
+$ git init
+$ git annex init
+$ git annex webapp
+````
+
+You'll get:
+
+````
+x Committed changes to git
+× Added bar
+× Performed startup scan
+````
+
+But I wouldn't expect that. Why should the command `git annex webapp` run an `add` command?
+"""]]
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_23_c674ce3dcacdaf158f05dab3954cacbc._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_23_c674ce3dcacdaf158f05dab3954cacbc._comment
new file mode 100644
index 000000000..32fddc008
--- /dev/null
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_23_c674ce3dcacdaf158f05dab3954cacbc._comment
@@ -0,0 +1,36 @@
+[[!comment format=mdwn
+ username="timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991"
+ nickname="timothyhobbs"
+ subject="comment 23"
+ date="2016-04-06T10:14:30Z"
+ content="""
+\"\"\"
+It is silly to use any version control system to synchronize anything but small plain text files. By doing so, you throw away a perfectly working version control system and have to deal with merge conflicts between version A and version B of the non-text files.
+
+Unless you have some magical solution to that merge conflict problem, there's no point in further discussion.
+\"\"\"
+
+Git doesn't know how to merge image files, but you can still track a jpeg using git. Git also doesn't know how to merge open office documents, but you can also track them using git. Indeed, you can even diff them, because first, git let you track them, and then, in true unix fashion, someone wrote a utility to solve the next unsolved problem.
+
+How are you feeling emotionally about this problem with git-annex? It seems to me that you set out to create a generic file synchronization tool. When you launched the kickstarter, you titled it: \"git-annex assistant: Like DropBox, but with your own cloud\" With the subtitle being \"Manage, share, and sync your large files with the power of git and the ease of use of a simple folder you drop files into.\". Do you now feel that this goal is unattainable because of the limitations of git-annex and git? That's OK, if you feel that your goal isn't attainable, but you should say so outright: \"I know I set out to sync arbitrary files, but it turns out that this method just doesn't work for that, so all of you users who come along with that impression from previous advertising, I'm afraid I have to disappoint you. Git-annex still works great for archiving data and media, and it's also good for tracking asset files in an existing git repository, but as a drop box clone its a no-go.\"
+
+Right now, the current presentation is really confusing. I came along, thinking that git annex is INTENDED to be able to synchronize arbitrary data, and then I find you writing in the bugs section, that anyone who wants to do that is silly.
+
+I know that it is hard for a free software developer to work on something alone. I too am a solitary free software developer, and at 25, I can truly say that I set out to follow in your footsteps. I knew of your frugal lifestyle at the beginning of my adult life, and I saw its benefits, that I would not have to compromise my ethics by way of need for money. I asked my parents for financial assistance, and received it. Now, for the past several years, I have tried to work on my own, on free software, my project being [subuser](subuser.org). I find this work style emotionally taxing in a way that I never imagined. For a short while, I worked for [Satoshi labs](http://satoshilabs.com/) on their open source Trezor hardware bitcoin wallet. While I was there, I enjoyed myself immensely. Whenever I ran into a technical problem, I'd just shout across my desk at my boss, and he would run over and we would solve it together. But, due to my English skills, management there started wanting me to fulfill more and more marketing tasks. So I left. Now, when I don't know how to solve some problem, I ruminate over it alone. I search for Google on end, and eventually open up reddit or hackernews, to distract myself from my feelings of failure. I want to write great free software, and improve the world, without ever having to compromise my restrictive ethical beliefs but its just not that easy.
+
+If you feel stressed or overwhelmed by maintaining a huge free software project alone, I can relate to that. If that stress and frustration means that you lash out at your users, I can understand. But I beg you to not let that feeling overshadow your work, and eliminate its value.
+
+I believe that git annex can be useful for the tasks you set out for it to perform. There are some problems:
+
+ - it doesn't know how to track file permissions/attributes
+ - it cannot track empty folders
+ - it cannot track git repositories
+
+But I don't think that you should give up on trying to solve these problems. If you want, I can help you to solve them.
+
+But only if you don't think that I am silly for trying.
+
+----
+
+There is a dream of a post-scarcity society. A society in which free technology provides people what they need. A place where resources are not so scarce as to force people to be unkind of to engage in dishonest marketing. I believe in that dream. But if even we two, who are not driven by want or greed to be unkind to each other, fall to bickering. That saddens me greatly.
+"""]]
diff --git a/doc/bugs/largefiles_not_working_when_set_in_.gitattributes.mdwn b/doc/bugs/largefiles_not_working_when_set_in_.gitattributes.mdwn
new file mode 100644
index 000000000..9452cbff2
--- /dev/null
+++ b/doc/bugs/largefiles_not_working_when_set_in_.gitattributes.mdwn
@@ -0,0 +1,74 @@
+### Please describe the problem.
+annex.largefiles saved in .gitattributes does not work when running 'git annex add' from a subdirectory
+
+I set annex.largefiles to include any files larger than 50k or any files that are executable. This works if I'm adding a files from top level directory. But if I'm adding files from a sub-directory it does not work.
+
+### What steps will reproduce the problem?
+see log below
+
+### What version of git-annex are you using? On what operating system?
+ubuntu 15.10
+
+git-annex version: 6.20160318-gd594fc0
+build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
+remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+
+
+### 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
+
+vagrant@u240:/tmp/annex/$ git init
+Initialized empty Git repository in /tmp/annex/.git/
+vagrant@u240:/tmp/annex/$ git annex init
+init  ok
+(recording state in git...)
+vagrant@u240:/tmp/annex/$ mkdir sub-dir
+vagrant@u240:/tmp/annex/$ cp /bin/tempfile .
+‘/bin/tempfile’ -> ‘./tempfile’
+vagrant@u240:/tmp/annex/$ cp /bin/tempfile sub-dir/
+‘/bin/tempfile’ -> ‘sub-dir/tempfile’
+vagrant@u240:/tmp/annex/$ file --mime-type tempfile 
+tempfile: application/x-executable
+vagrant@u240:/tmp/annex/$ cat .gitattributes 
+* annex.largefiles=((largerthan=50kb)or(mimetype=application/x-executable))
+vagrant@u240:/tmp/annex/$ ls -l tempfile
+-rwxr-xr-x 1 vagrant vagrant 10352 Apr  6 15:19 tempfile
+# the file is 10k in size and I can annex it from top level directory
+vagrant@u240:/tmp/annex/$ git annex add tempfile sub-dir/tempfile
+add tempfile ok
+add sub-dir/tempfile ok
+(recording state in git...)
+vagrant@u240:/tmp/annex/$ cp /bin/tempfile tempfile2
+‘/bin/tempfile’ -> ‘tempfile2’
+vagrant@u240:/tmp/annex/$ cp /bin/tempfile sub-dir/tempfile2
+‘/bin/tempfile’ -> ‘sub-dir/tempfile2’
+vagrant@u240:/tmp/annex/$ cd sub-dir/
+# same file but I can not annex it if running from a sub-directory
+vagrant@u240:/tmp/annex/sub-dir/$ git annex add ../tempfile2 tempfile2
+add ../tempfile2 ok
+add tempfile2 (non-large file; adding content to git repository) ok
+(recording state in git...)
+vagrant@u240:/tmp/annex/sub-dir/$ cd ..
+vagrant@u240:/tmp/annex/$ ls -lR
+.:
+total 12
+drwxrwxr-x 2 vagrant vagrant 4096 Apr  6 15:21 sub-dir/
+lrwxrwxrwx 1 vagrant vagrant  186 Apr  6 15:19 tempfile -> .git/annex/objects/xj/kJ/SHA256E-s10352--93a1f74ec1714ef2107989076140b4eaae220f7b2cde834c16a7ad654d12b0f5/SHA256E-s10352--93a1f74ec1714ef2107989076140b4eaae220f7b2cde834c16a7ad654d12b0f5
+lrwxrwxrwx 1 vagrant vagrant  186 Apr  6 15:20 tempfile2 -> .git/annex/objects/xj/kJ/SHA256E-s10352--93a1f74ec1714ef2107989076140b4eaae220f7b2cde834c16a7ad654d12b0f5/SHA256E-s10352--93a1f74ec1714ef2107989076140b4eaae220f7b2cde834c16a7ad654d12b0f5
+
+./sub-dir:
+total 16
+lrwxrwxrwx 1 vagrant vagrant   189 Apr  6 15:20 tempfile -> ../.git/annex/objects/xj/kJ/SHA256E-s10352--93a1f74ec1714ef2107989076140b4eaae220f7b2cde834c16a7ad654d12b0f5/SHA256E-s10352--93a1f74ec1714ef2107989076140b4eaae220f7b2cde834c16a7ad654d12b0f5
+-rwxr-xr-x 1 vagrant vagrant 10352 Apr  6 15:21 tempfile2
+
+
+# End of transcript or log.
+"""]]
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+
diff --git a/doc/forum/Simple_question_about_web_remote.mdwn b/doc/forum/Simple_question_about_web_remote.mdwn
new file mode 100644
index 000000000..180540507
--- /dev/null
+++ b/doc/forum/Simple_question_about_web_remote.mdwn
@@ -0,0 +1,27 @@
+Hello. I have been having some trouble with downloading podcasts. I have read the guide, but I was getting the following error message:
+
+```
+  verification of content failed
+
+  Unable to access these remotes: web
+
+  Try making some of these repositories available:
+  	00000000-0000-0000-0000-000000000001 -- web
+failed
+git-annex: get: 1 failed
+```
+I have tried several times. Some times it seemed to work, others it did not — it was not very structured, so I do not recall the details. Recently I recreated the entire stuff from scratch and was downloading files, and after I upgraded to 6.20160318 it stopped working and just gives me the error message above, after downloading the file.
+
+I tried looking up information about the web remote, but it mentions nothing about "making the web remote available" or something that I found to address this subject. So I am confused. What is wrong with my web repository? Why did it stop working? How can I fix it? How can I prevent this from happening in the future? Thank you.
+
+Here is the version information:
+
+```
+git-annex version: 6.20160318
+build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
+remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+local repository version: 6
+supported repository versions: 5 6
+upgrade supported from repository versions: 0 1 2 4 5
+```