Fix a long-standing bug that could cause the wrong index file to be used when committing to the git-annex branch, if GIT_INDEX_FILE is set in the environment. This typically resulted in git-annex branch log files being committed to the master branch and later showing up in the work tree. (These log files can be safely removed.)

This commit is contained in:
Joey Hess 2014-01-14 15:36:33 -04:00
parent 188f0bd58d
commit d07f2d7865
7 changed files with 31 additions and 11 deletions

5
debian/changelog vendored
View file

@ -8,6 +8,11 @@ git-annex (5.20140108) UNRELEASED; urgency=medium
* map: Fix display of v5 direct mode repos.
* repair: Support old git versions from before git fsck --no-dangling was
implemented.
* Fix a long-standing bug that could cause the wrong index file to be used
when committing to the git-annex branch, if GIT_INDEX_FILE is set in the
environment. This typically resulted in git-annex branch log files being
committed to the master branch and later showing up in the work tree.
(These log files can be safely removed.)
-- Joey Hess <joeyh@debian.org> Wed, 08 Jan 2014 13:13:54 -0400