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

6 files changed, 80 insertions, 0 deletions

diff --git a/doc/bugs/OSX:_addurl_--batch_--json_spits_out_shortened_output_string__dies_off_with_4.mdwn b/doc/bugs/OSX:_addurl_--batch_--json_spits_out_shortened_output_string__dies_off_with_4.mdwn
new file mode 100644
index 000000000..25fab9299
--- /dev/null
+++ b/doc/bugs/OSX:_addurl_--batch_--json_spits_out_shortened_output_string__dies_off_with_4.mdwn
@@ -0,0 +1,38 @@
+### Please describe the problem.
+
+See transcript.  Didn't bisect fully but 6.20160128-g599a3ba seems to work ok, 6.20160211-g479a094 already dies off
+
+[[!format sh """
+
+datalads-imac:~ yoh$ git annex version
+git-annex version: 6.20160221-g3d1895e
+...
+datalads-imac:~ yoh$ mkdir -p /tmp/123; cd /tmp/123; git init; git annex init;  
+Initialized empty Git repository in /private/tmp/123/.git/
+init  ok
+(recording state in git...)
+
+datalads-imac:123 yoh$  rm -f /tmp/pipe; mkfifo /tmp/pipe; cat /tmp/pipe | git -c receive.autogc=false annex addurl -c annex.largefiles=exclude=*.txt --with-files --json --batch 
+{"command":"addurl","file":"1.png","note":"downloading http://www.onerussian.com/tmp/banner.png ..."error: git-annex died of signal 4
+
+# now with --debug
+datalads-imac:123 yoh$  rm -f /tmp/pipe; mkfifo /tmp/pipe; cat /tmp/pipe | git -c receive.autogc=false annex addurl -c annex.largefiles=exclude=*.txt --with-files --json --batch --debug
+[2016-02-23 08:32:49.160686] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","-c","annex.largefiles=exclude=*.txt","show-ref","git-annex"]
+[2016-02-23 08:32:49.167372] process done ExitSuccess
+[2016-02-23 08:32:49.167479] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","-c","annex.largefiles=exclude=*.txt","show-ref","--hash","refs/heads/git-annex"]
+[2016-02-23 08:32:49.172795] process done ExitSuccess
+[2016-02-23 08:32:49.173039] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","-c","annex.largefiles=exclude=*.txt","log","refs/heads/git-annex..b2892e67682c5240dadb5d439da810edbdb882df","-n1","--pretty=%H"]
+[2016-02-23 08:32:49.178586] process done ExitSuccess
+[2016-02-23 08:32:49.179085] chat: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","-c","annex.largefiles=exclude=*.txt","cat-file","--batch"]
+[2016-02-23 08:32:49.183985] read: quvi ["--version"]
+{"command":"addurl","file":"1.png","note":"downloading http://www.onerussian.com/tmp/banner.png ..."[2016-02-23 08:32:49.255949] call: curl ["-s","-f","-L","-C","-","-#","-o","/private/tmp/123/.git/annex/tmp/URL-s25319--http&c%%www.onerussian.com%tmp%banner.png","http://www.onerussian.com/tmp/banner.png","--user-agent","git-annex/6.20160221-g3d1895e"]
+[2016-02-23 08:32:49.302577] process done ExitSuccess
+[2016-02-23 08:32:49.303332] chat: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","-c","annex.largefiles=exclude=*.txt","check-attr","-z","--stdin","annex.backend","annex.numcopies","annex.largefiles","--"]
+[2016-02-23 08:32:49.305653] read: git ["--version"]
+[2016-02-23 08:32:49.310314] process done ExitSuccess
+error: git-annex died of signal 4
+
+"""]]
+
+[[!meta author=yoh]]
+
diff --git a/doc/forum/Is_there_any_delta_handling_for_file_modifications__63__/comment_2_e46cb391ce377c3a8eb40155a5d0f001._comment b/doc/forum/Is_there_any_delta_handling_for_file_modifications__63__/comment_2_e46cb391ce377c3a8eb40155a5d0f001._comment
new file mode 100644
index 000000000..2883d29e3
--- /dev/null
+++ b/doc/forum/Is_there_any_delta_handling_for_file_modifications__63__/comment_2_e46cb391ce377c3a8eb40155a5d0f001._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="git-annex@c063eec406e857662ac6bbb814defa6aebde6417"
+ nickname="git-annex"
+ subject="any plans to add this?"
+ date="2016-02-21T12:12:43Z"
+ content="""
+Presumably this is a desirable feature for faster syncing of modifications to large files, so are there any plans to add it?
+"""]]
diff --git a/doc/todo/import_--reinject.mdwn b/doc/todo/import_--reinject.mdwn
new file mode 100644
index 000000000..b34a2b1f9
--- /dev/null
+++ b/doc/todo/import_--reinject.mdwn
@@ -0,0 +1,5 @@
+There's `git annex reinject <src> <dst>` for re-adding one file's contents to the local annex. But what if I have a whole bunch of files, and want git-annex itself to decide whether & where it needs to reinject them? (And if the file doesn't need to be reinjected, it would remain in its original place.)
+
+None of the `git annex import` modes work properly in this case. By default, importing adds another, unnecessary copy of the imported file (which I have to `rm` after importing). The `--clean-duplicates` mode seems close, but it insists on verifying the content in other repositories rather than just reinjecting it locally. (Let's assume that the main reason I'm trying to reinject is that I cannot access other repos.)
+
+So I'm hoping for something like `git annex import --reinject <src>...`. Or are there other existing ways to achieve the same? I couldn't find any.
diff --git a/doc/todo/import_--reinject/comment_1_659f0d18de4f5ee94adaf85ca106e196._comment b/doc/todo/import_--reinject/comment_1_659f0d18de4f5ee94adaf85ca106e196._comment
new file mode 100644
index 000000000..2aeb49cfa
--- /dev/null
+++ b/doc/todo/import_--reinject/comment_1_659f0d18de4f5ee94adaf85ca106e196._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="CandyAngel"
+ subject="comment 1"
+ date="2016-02-23T12:24:48Z"
+ content="""
+git-annex verifies the content in other repositories when you use --clean-duplicates because if it did not, it could delete the only copy of a file you had, because it was deleting files it knew about, but didn't have.
+
+As for what you are attempting, [maybe something like this](https://git-annex.branchable.com/tips/recover_data_from_lost+found/)?
+"""]]
diff --git a/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev.mdwn b/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev.mdwn
new file mode 100644
index 000000000..2139c3090
--- /dev/null
+++ b/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev.mdwn
@@ -0,0 +1 @@
+I'm setting up an Android build environment, and the standalone/android/install-haskell-packages script fails while installing the Magic package. The standalone/android/buildchroot-inchroot package should run `apt-get -y install libmagic-dev` to install this dependency.
diff --git a/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev/comment_1_daef0416d365b60d36e211adcdb42ffb._comment b/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev/comment_1_daef0416d365b60d36e211adcdb42ffb._comment
new file mode 100644
index 000000000..9993b6332
--- /dev/null
+++ b/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev/comment_1_daef0416d365b60d36e211adcdb42ffb._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899"
+ nickname="divergentdave"
+ subject="comment 1"
+ date="2016-02-21T05:15:57Z"
+ content="""
+I got further along in the build process, but cabal couldn't install the \"arm-linux-androideabi-4.8\" versions of `magic` and `terminal-size`. The magic library couldn't be installed because there wasn't an appropriate C library available. The terminal-size library failed with the following compilation error.
+
+```
+Posix.hsc: In function '_hsc2hs_test11':
+Posix.hsc:32:39: error: invalid application of 'sizeof' to incomplete type 'struct winsize'
+In file included from /home/builder/.ghc/android-14/arm-linux-androideabi-4.8/sysroot/usr/include/sys/types.h:33:0,
+                 from /home/builder/.ghc/android-14/arm-linux-androideabi-4.8/sysroot/usr/include/unistd.h:33,
+                 from Posix.hsc:21:
+Posix.hsc: In function '_hsc2hs_test15':
+Posix.hsc:35:48: error: invalid use of undefined type 'struct winsize'
+...
+```
+"""]]