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

3 files changed, 62 insertions, 0 deletions

diff --git a/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree.mdwn b/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree.mdwn
new file mode 100644
index 000000000..57f95d992
--- /dev/null
+++ b/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree.mdwn
@@ -0,0 +1,46 @@
+### Please describe the problem.
+
+On windows, git-annex webapp reports a crash.
+
+On the command-line, I get :
+
+$ git annex fsck
+fatal: unable to read tree 6d692a016b7d772800ddc3993ffd68fc6aaa21f3
+error: invalid object 100644 39e3d739a15dc3ed11a0c324781bf3658ccb933a for '001/e8c/SHA256E-s38500--9017f32c23b4de6363d3e5105bc1c47dd3cd983e471e71e0a9d420daaf0e3e7b.html.log'
+fatal: git-write-tree: error building trees
+(merging origin/git-annex into git-annex...)
+(recording state in git...)
+git-annex: failed to read sha from git write-tree
+
+Then, I try :
+
+$ git annex repair
+Running git fsck ...
+Unpacking all pack files.
+
+git-annex: DeleteFile ".git\\objects\\pack\\pack-c53ea32e9514b6dda95af1d8d879d91d32240d76.idx": permission denied (Accès refusé.)
+failed
+git-annex: repair: 1 failed
+
+
+### What steps will reproduce the problem?
+
+Dunno how that got messed up, and what to do now...
+
+### What version of git-annex are you using? On what operating system?
+
+latest nightly build (2015/10/19) on win 7
+
+### 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
+
+
+# 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/devblog/day_328__git-annex_is_five/comment_2_9e18a2c71884229f06b5ba62a6529a33._comment b/doc/devblog/day_328__git-annex_is_five/comment_2_9e18a2c71884229f06b5ba62a6529a33._comment
new file mode 100644
index 000000000..404eb4ec7
--- /dev/null
+++ b/doc/devblog/day_328__git-annex_is_five/comment_2_9e18a2c71884229f06b5ba62a6529a33._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="CandyAngel"
+ subject="comment 2"
+ date="2015-10-21T09:59:06Z"
+ content="""
+Yay! Really glad I got to be part of (part of) the journey so far :)
+
+Thank you Joey. Hip hip, hooray!
+"""]]
diff --git a/doc/todo/show_me_where_unused_file_was__44___i_can_wait.mdwn b/doc/todo/show_me_where_unused_file_was__44___i_can_wait.mdwn
new file mode 100644
index 000000000..c080d2b7c
--- /dev/null
+++ b/doc/todo/show_me_where_unused_file_was__44___i_can_wait.mdwn
@@ -0,0 +1,7 @@
+i know that `git annex unused` would be slower if, instead of just showing the hash, it would also show the pathname where the file was. it does tell me that i can use `git log --stat -SKEY` to find that out myself, but then i would need to make some silly shell script to loop over multiple files. i'm hoping that git-annex has more efficient and clever ways of doing that, and even if it's slower, i'd be ready to wait if there was an extra flag to show me where it was...
+
+i have used this oneliner so far, but it's ugly and painful, especially since `git annex unused` doesn't have a very parseable output format...
+
+    git annex unused 2>&1 | grep '^  *[0-9][0-9]*' | sed 's/^ *[0-9][0-9]* *//' | xargs -I'{}' git log --oneline --stat -S'{}' -1
+
+any way to do this more easily? --[[anarcat]]