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

This commit is contained in:
Joey Hess 2016-10-31 18:34:27 -04:00
commit a986b12cf2
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
4 changed files with 50 additions and 2 deletions

View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="aranea@650e41fad422f2a4d6f36ca1f20d41b7c0f18ab7"
nickname="aranea"
avatar="http://cdn.libravatar.org/avatar/8574023ce00757ca95b1708b7306602a"
subject="comment 2"
date="2016-10-31T21:29:42Z"
content="""
> What kind of performance benefit are we talking about here?
Not much. In my benchmark, SKEIN512 was about 10% faster thank SKEIN256, and SKEIN256 has quite reasonable speed anyway. Thus, adding SKEIN512_256 is not neccessary if it complicated the code too much.
Thanks anyway!
"""]]

View file

@ -0,0 +1,26 @@
### Please describe the problem.
git-annex throws an error message (see below) when trying to add a file whose name includes a space.
### What version of git-annex are you using? On what operating system?
git-annex version: 6.20161012
build flags: ConcurrentOutput Feeds Quvi
uname -srm: Linux 4.7.10-hardened x86_64
### Please provide any additional information below.
[[!format sh """
aranea@gentp ~/t/annex-test $ git init .
Initialized empty Git repository in /home/aranea/tmp/annex-test/.git/
aranea@gentp ~/t/annex-test master $ git annex init
init ok
(recording state in git...)
aranea@gentp ~/t/annex-test master $ touch 'foo bar'
aranea@gentp ~/t/annex-test master $ git annex add
add foo bar git-annex: unknown response from git cat-file ("HEAD:./foo bar missing",Ref "HEAD:./foo bar")
CallStack (from HasCallStack):
error, called at ./Git/CatFile.hs:102:28 in main:Git.CatFile
"""]]

View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="aranea@650e41fad422f2a4d6f36ca1f20d41b7c0f18ab7"
nickname="aranea"
avatar="http://cdn.libravatar.org/avatar/8574023ce00757ca95b1708b7306602a"
subject="comment 1"
date="2016-10-31T22:31:44Z"
content="""
According to git bisect, this bug has been introduced a month ago by commit 34530e59.
"""]]

View file

@ -15,11 +15,11 @@ The remote "rsync" points to the same location of the annex /my-repo/.git/annex
If I add a file
git annex add file1
git annex add file1
and then I check where it is available
git annex whereis file 1
git annex whereis file 1
I obtain that it is not available on 'rsync'