summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--Command/ReKey.hs4
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 444d43b75..10b6a7577 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,8 @@ git-annex (6.20161211) UNRELEASED; urgency=medium
* Debian: Build webapp on armel.
* Linux standalone: Improve generation of locale definition files,
supporting locales such as, en_GB.UTF-8.
+ * rekey --force: Incorrectly marked the new key's content as being
+ present in the local repo even when it was not.
-- Joey Hess <id@joeyh.name> Sun, 11 Dec 2016 21:29:51 -0400
diff --git a/Command/ReKey.hs b/Command/ReKey.hs
index 4ddbd68b6..aaaaf7e37 100644
--- a/Command/ReKey.hs
+++ b/Command/ReKey.hs
@@ -126,6 +126,6 @@ cleanup file oldkey newkey = do
Database.Keys.removeAssociatedFile oldkey
=<< inRepo (toTopFilePath file)
)
-
- logStatus newkey InfoPresent
+ whenM (inAnnex newkey) $
+ logStatus newkey InfoPresent
return True