summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-11-06 15:28:20 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-11-06 15:28:20 -0400
commit90d833e44240dd0a83fd2439fa1a23e490959235 (patch)
tree9a0f4bed733aa274422d932c761b972a754cdd34 /debian
parentd2ab9f9c90e8a73f99bfad452fd17cc2f77ad230 (diff)
add: Fix error recovery rollback to not move the injested file content out of the annex back to the file, because other files may point to that same content. Instead, copy the injected file content out to recover.
That was not a data loss, but it came close!
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 4f10ff57d..43eddfa0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ git-annex (5.20151102.2) UNRELEASED; urgency=medium
that moves file contents around.
* Fix race that could result in an annexed file's symlink not being
created, when eg, running concurrent git-annex adds.
+ * add: Fix error recovery rollback to not move the injested file content
+ out of the annex back to the file, because other files may point to
+ that same content. Instead, copy the injected file content out to
+ recover.
-- Joey Hess <id@joeyh.name> Wed, 04 Nov 2015 12:50:20 -0400