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

This commit is contained in:
Joey Hess 2018-11-15 12:31:51 -04:00
commit ac27c29490
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38

View file

@ -0,0 +1,24 @@
### Please describe the problem.
`git annex upgrade` to v6 configures a filter using `git-annex smudge`. With it, `git diff` can't be run on files external to the repository, without getting a lot of stderr output like:
fatal: '../test.txt' is outside repository
error: external filter 'git-annex smudge --clean %f' failed 1
This breaks vim-gitgutter signs, and possibly other tools as well.
### What steps will reproduce the problem?
[[!format sh """
$ git init test
$ cd test
$ git annex init
$ git annex upgrade
$ git diff ../file1.txt ../file2.txt
"""]]
### What version of git-annex are you using? On what operating system?
6.20180913-1~bpo9+1 on Debian Stretch + backports.