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

This commit is contained in:
Joey Hess 2014-02-03 21:26:04 -04:00
commit 83e6fb7319

View file

@ -0,0 +1,36 @@
### Please describe the problem.
Git annex assistant ignores .gitignore file due to packaged git version being too old.
I have a locally installed version that is greater than the 1.8.4 needed to respect .gitignore but git annex doesn't use it.
### What steps will reproduce the problem?
- Create local repository using webapp
- Add .gitignore file to local repository
- Add files that match .gitignore patterns and watch git annex add them
### What version of git-annex are you using? On what operating system?
Git Annex assistant version 5.20140128-g0ac94c3 on Mac OS 10.9.1
### Please provide any additional information below.
Log message is "The installed version of git is too old for .gitignores to be honored by git-annex."
[[!format sh """
# /Applications/git-annex.app/Contents/MacOS/git-annex version
git-annex version: 5.20140128-g0ac94c3
build flags: Assistant Webapp Pairing S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
# /Applications/git-annex.app/Contents/MacOS/git --version
git version 1.8.3.4 (Apple Git-47)
# which git
/usr/local/bin/git
# /usr/local/bin/git --version
git version 1.8.5.3
"""]]