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

3 files changed, 49 insertions, 0 deletions

diff --git a/doc/bugs/Using_date_matching_options_gives_scary_error_messaes_on_empty_reflog.mdwn b/doc/bugs/Using_date_matching_options_gives_scary_error_messaes_on_empty_reflog.mdwn
new file mode 100644
index 000000000..487849f78
--- /dev/null
+++ b/doc/bugs/Using_date_matching_options_gives_scary_error_messaes_on_empty_reflog.mdwn
@@ -0,0 +1,33 @@
+### Please describe the problem.
+
+When the reflog is empty, time-based `--in` expressions give scary messages that makes it look like something is really broken.
+
+Instead of `Fatal: Log blabla is empty` and `Broken pipe` a reasonable message would be e.g. `warning: Log for 'refs/heads/git-annex' is empty.`
+
+### What steps will reproduce the problem?
+
+Emptying reflog for `refs/heads/git-annex`, then using an `--in=here{date}` option to e.g. `git annex fsck`.
+
+### What version of git-annex are you using? On what operating system?
+
+`git-annex version: 5.20140412ubuntu1` on Ubuntu Trusty.
+
+### 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
+
+$ git reflog expire --expire=all refs/heads/git-annex
+$ git annex find --not --in here@{yesterday}
+fatal: Log /home/clacke/pics/.git/logs/refs/heads/git-annex is empty.
+fatal: Log /home/clacke/pics/.git/logs/refs/heads/git-annex is empty.
+[ . . . ]
+^C
+git-annex: fd:10: hGetLine: end of file
+git-annex: fd:9: hFlush: resource vanished (Broken pipe)
+git-annex: fd:9: hFlush: resource vanished (Broken pipe)
+[ . . . ]
+
+# End of transcript or log.
+"""]]
diff --git a/doc/install/Android/comment_11_3e7980603749665fafbdeb1b7ab068a5._comment b/doc/install/Android/comment_11_3e7980603749665fafbdeb1b7ab068a5._comment
new file mode 100644
index 000000000..dc620bfcb
--- /dev/null
+++ b/doc/install/Android/comment_11_3e7980603749665fafbdeb1b7ab068a5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnG-DZQa3d3Jn7K2q36TlbmZ8v2YuV-23M"
+ nickname="Fer"
+ subject="Android x86?"
+ date="2015-03-23T06:55:35Z"
+ content="""
+Hello, looks like the binaries compiled for ARM, anyone succeeded building for Android x86?
+"""]]
diff --git a/doc/internals/hashing/comment_7_843592cf125be06fb316be43b85b0524._comment b/doc/internals/hashing/comment_7_843592cf125be06fb316be43b85b0524._comment
new file mode 100644
index 000000000..7c426e8e6
--- /dev/null
+++ b/doc/internals/hashing/comment_7_843592cf125be06fb316be43b85b0524._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="giomasce"
+ subject="Python implementation"
+ date="2015-03-22T22:38:54Z"
+ content="""
+I wrote a Python implementation of the two hashing functions for a project of mine. [Here it is](https://gist.github.com/giomasce/a7802bda1417521c5b30), hoping it can be helpful for somone.
+
+"""]]