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

8 files changed, 110 insertions, 0 deletions

diff --git a/doc/bugs/SmartGit__39__s_Cherry-Pick_function_throws_error_with_git-annex/comment_2_3dbaf39065c2f0941f8f7092c27fd4cb._comment b/doc/bugs/SmartGit__39__s_Cherry-Pick_function_throws_error_with_git-annex/comment_2_3dbaf39065c2f0941f8f7092c27fd4cb._comment
new file mode 100644
index 000000000..7f401acd6
--- /dev/null
+++ b/doc/bugs/SmartGit__39__s_Cherry-Pick_function_throws_error_with_git-annex/comment_2_3dbaf39065c2f0941f8f7092c27fd4cb._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="jhannwong@c9c7a67b5632a4bbc0c959cfeb3d340e02f28565"
+ nickname="jhannwong"
+ subject="A problem with SmartGit then?"
+ date="2015-12-21T03:21:58Z"
+ content="""
+> git-annex init sets up .git/hooks/pre-commit to run git annex pre-commit. It looks like when git commit is run, the git-annex program is not in PATH. This probably has something to do with the way you installed git-annex.
+
+``which git-annex`` shows ``/usr/local/bin/git-annex``. I think I installed via Homebrew.
+
+Seems to be a problem with SmartGit then. The pre-commit hooks work just fine in Terminal sessions.
+
+> (Why is git-annex | less blanking out? Because git-annex outputs usage messages to stderr, and less pages stdout. Use git-annex 2>&1 |less)
+
+Ah. Oops.
+"""]]
diff --git a/doc/bugs/git-annex_cannot_connect_to_freenet_cloud___40__webdav__41__/comment_3_b2ef283a3933e22542e05ce9a1acef7d._comment b/doc/bugs/git-annex_cannot_connect_to_freenet_cloud___40__webdav__41__/comment_3_b2ef283a3933e22542e05ce9a1acef7d._comment
new file mode 100644
index 000000000..3403a59fc
--- /dev/null
+++ b/doc/bugs/git-annex_cannot_connect_to_freenet_cloud___40__webdav__41__/comment_3_b2ef283a3933e22542e05ce9a1acef7d._comment
@@ -0,0 +1,38 @@
+[[!comment format=mdwn
+ username="sts"
+ subject="comment 3"
+ date="2015-12-20T19:49:26Z"
+ content="""
+hey joey!
+
+thanks, it (kinda) worked :). At least the initialization works now pretty fine. But uploading files does not work as expected. It does upload  some data, but does not move the data to the corresponding folder (from 'tmp' to $hash):
+
+    git annex copy --debug --to webdav 1354580391258.jpg
+    [2015-12-20 20:31:36.985579] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"show-ref\",\"git-annex\"]
+    [2015-12-20 20:31:36.990098] process done ExitSuccess
+    [2015-12-20 20:31:36.990584] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
+    [2015-12-20 20:31:36.993635] process done ExitSuccess
+    [2015-12-20 20:31:36.994311] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"log\",\"refs/heads/git-annex..2ff0c487bc1c92c11a45131b55f6fb2ba034071d\",\"-n1\",\"--pretty=%H\"]
+    [2015-12-20 20:31:36.998675] process done ExitSuccess
+    [2015-12-20 20:31:36.999747] chat: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"cat-file\",\"--batch\"]
+    [2015-12-20 20:31:37.003483] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"ls-files\",\"--cached\",\"-z\",\"--\",\"1354580391258.jpg\"]
+    copy 1354580391258.jpg (checking webdav...) (to webdav...) 
+    100%        564.6KB/s 0s
+    DAV failure: 409 \"Conflict\"
+    failed
+    git-annex: copy: 1 failed
+
+In the 'tmp'-folder on the server I can find the file ('SHA256E-s1156230--...'), but this file is not 100% identical to the one I uploaded. Well, it seems that the first byte is missing ;) at least if I compare the files via vimdiff:
+
+    0000000: d8ff e000 104a 4649 4600 0101 0100 4800  .....JFIF.....H.               |  0000000: ffd8 ffe0 0010 4a46 4946 0001 0101 0048  ......JFIF.....H               
+    0000010: 4800 00ff db00 4300 0101 0101 0101 0101  H.....C.........               |  0000010: 0048 0000 ffdb 0043 0001 0101 0101 0101  .H.....C........               
+    0000020: 0101 0101 0102 0203 0202 0202 0204 0303  ................               |  0000020: 0101 0101 0101 0202 0302 0202 0202 0403  ................               
+    0000030: 0203 0504 0505 0504 0404 0506 0706 0505  ................               |  0000030: 0302 0305 0405 0505 0404 0405 0607 0605  ................               
+    0000040: 0706 0404 0609 0607 0808 0808 0805 0609  ................               |  0000040: 0507 0604 0406 0906 0708 0808 0808 0506  ................               
+    0000050: 0a09 080a 0708 0808 ffdb 0043 0101 0101  ...........C....               |  0000050: 090a 0908 0a07 0808 08ff db00 4301 0101  ............C...               
+    0000060: 0202 0204 0202 0408 0504 0508 0808 0808  ................               |  0000060: 0102 0202 0402 0204 0805 0405 0808 0808  ................
+
+As you can see, on the left side (aka 'the uploaded file') the first two hexadecimal values are missing in comparison to the right side (the source), so the first byte is missing.
+
+I guess in the end it is still the same problem, right :)?
+"""]]
diff --git a/doc/forum/Manipulate_a_git-annex_repo_from_an_Android_app/comment_2_20ee5f900a2ff6154c0d90263579723e._comment b/doc/forum/Manipulate_a_git-annex_repo_from_an_Android_app/comment_2_20ee5f900a2ff6154c0d90263579723e._comment
new file mode 100644
index 000000000..e95d090e5
--- /dev/null
+++ b/doc/forum/Manipulate_a_git-annex_repo_from_an_Android_app/comment_2_20ee5f900a2ff6154c0d90263579723e._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="cbaines"
+ subject="comment 2"
+ date="2015-12-21T12:40:52Z"
+ content="""
+I am also interested in this.
+
+It might be better to use intents [1], such that git-annex on Android can provide an interface for any app to ask it to perform actions on repositories.
+
+Joey, is there any kind of api in the current Android app?
+
+1: https://developer.android.com/reference/android/content/Intent.html
+"""]]
diff --git a/doc/forum/Purge_whereis.mdwn b/doc/forum/Purge_whereis.mdwn
new file mode 100644
index 000000000..d5b614898
--- /dev/null
+++ b/doc/forum/Purge_whereis.mdwn
@@ -0,0 +1,9 @@
+Hey there,
+
+I am playing around with git-annex to handle my files and backup's. Sometimes, I wish to delete a file entirely from my local repo and any other repo that contains the file.
+
+First, I drop the file from my local repo and run git-annex sync --content. Then I run git annex whereis and drop the file from other repo's. Subsequently, I run git annex whereis to ensure that the file has been dropped and does not exist in any repo.
+
+However, git annex still tracks the file, but I just have 0 copies of it. How do I remove/delete/disable tracking of a single file or multiple files?
+
+The reason why I have deleted the file is that I don't want it in any of my repo's any longer. 
diff --git a/doc/forum/Purge_whereis/comment_1_89d2446e3c9a58ab7b2a85ff941f7c8d._comment b/doc/forum/Purge_whereis/comment_1_89d2446e3c9a58ab7b2a85ff941f7c8d._comment
new file mode 100644
index 000000000..848d1b75b
--- /dev/null
+++ b/doc/forum/Purge_whereis/comment_1_89d2446e3c9a58ab7b2a85ff941f7c8d._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="cbaines"
+ subject="comment 1"
+ date="2015-12-21T12:32:55Z"
+ content="""
+If you want to stop tracking a file, just delete it, and then run git annex sync.
+
+There are some other commands (and settings in the assistant) for managing unused content. That is, files in the annex that are no longer referenced/used.
+"""]]
diff --git a/doc/forum/Purge_whereis/comment_2_0307ce47de9b719adc2096600d94dff6._comment b/doc/forum/Purge_whereis/comment_2_0307ce47de9b719adc2096600d94dff6._comment
new file mode 100644
index 000000000..66e7bd6f1
--- /dev/null
+++ b/doc/forum/Purge_whereis/comment_2_0307ce47de9b719adc2096600d94dff6._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="frost.kristian@75a6b6a25121f985cd8708f98c691d41716ac720"
+ nickname="frost.kristian"
+ subject="comment 2"
+ date="2015-12-21T13:08:49Z"
+ content="""
+It seems I have to enable syncing from the webapp. I thought doing git annex sync would do the same?
+"""]]
diff --git a/doc/forum/Purge_whereis/comment_3_e87b53ebbf8053bb17caeb2aed871212._comment b/doc/forum/Purge_whereis/comment_3_e87b53ebbf8053bb17caeb2aed871212._comment
new file mode 100644
index 000000000..bdfe711f2
--- /dev/null
+++ b/doc/forum/Purge_whereis/comment_3_e87b53ebbf8053bb17caeb2aed871212._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="cbaines"
+ subject="comment 3"
+ date="2015-12-21T13:33:34Z"
+ content="""
+I just did a quick test, running git annex sync does commit the removal of files for me.
+"""]]
diff --git a/doc/forum/Reusing_existing_annex.uuid/comment_2_cdb21c9c47c8a116e82062c9354d9339._comment b/doc/forum/Reusing_existing_annex.uuid/comment_2_cdb21c9c47c8a116e82062c9354d9339._comment
new file mode 100644
index 000000000..e100e5952
--- /dev/null
+++ b/doc/forum/Reusing_existing_annex.uuid/comment_2_cdb21c9c47c8a116e82062c9354d9339._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574"
+ nickname="Mica"
+ subject="comment 2"
+ date="2015-12-21T06:02:21Z"
+ content="""
+The gcrypt remotes are present in the remotes.log file, but I can't seem to push or sync to them.
+
+How do I get them added back to the repo such that using `git annex sync` syncs the content?
+"""]]