summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-14 15:36:33 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-14 15:36:33 -0400
commite6f32bd11c94221f82fe9acf6ecb74be2fab4a76 (patch)
treef52a5aa501875340c05f34c151fd027036cff83a /debian
parent44b6bc589b6e2219cd3a4cf57fd2dd30068b2744 (diff)
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.)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e844c5020..f1d76b781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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