aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG10
1 files changed, 10 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 38a947116..174e4a3e1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,16 @@ git-annex (6.20180228) UNRELEASED; urgency=medium
* Improve SHA*E extension extraction code to not treat parts of the
filename that contain punctuation or other non-alphanumeric characters
as extensions. Before, such characters were filtered out.
+ * Fix data loss bug when the local repository uses direct mode, and a
+ locally modified file is dropped from a remote repsitory. The bug
+ caused the modified file to be counted as a copy of the original file.
+ (This is not a severe bug because in such a situation, dropping
+ from the remote and then modifying the file is allowed and has the same
+ end result.)
+ * Fix bug in content locking over tor, when the remote repository is
+ in direct mode, it neglected to check that the content was actually
+ present when locking it. This could cause git annex drop to remove
+ the only copy of a file when it thought the tor remote had a copy.
-- Joey Hess <id@joeyh.name> Wed, 28 Feb 2018 11:53:03 -0400