summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-01-16 21:31:06 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-01-16 21:31:06 -0400
commitfb442da95e9f60a7fd5ee9e6c46792d256d2dca0 (patch)
tree13fcaa67a7988fe379e1ebe274a351e85747041a /debian
parent2fd0c120e18c2af234fd9a1a403d6ba3af850f83 (diff)
union merge bugfix
Union merges involving two or more repositories could sometimes result in data from one repository getting lost. This could result in the location log data becoming wrong, and fsck being needed to fix it. NB: I audited for any other occurrences of this problem. There are other places than union merge where multiple changes are fed into update-index in a stream, but they all involve working copy files being staged, or their deletion being staged, and in this case it's fine for the later changes to override the earlier ones.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 3595eb81b..24fbdc223 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ git-annex (3.20130115) UNRELEASED; urgency=low
in it that is not a git repository.
* Deal with incompatability in gpg2, which caused prompts for encryption
passphrases rather than using the supplied --passphrase-fd.
+ * bugfix: Union merges involving two or more repositories could sometimes
+ result in data from one repository getting lost. This could result
+ in the location log data becoming wrong, and fsck being needed to fix it.
-- Joey Hess <joeyh@debian.org> Mon, 14 Jan 2013 18:35:01 -0400