diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-19 18:18:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-19 18:18:57 -0400 |
| commit | aab2b60075ea806b78a32d45936a09cb46341ddc (patch) | |
| tree | d1782db89ef1db9ea90299e8d798a60547be2b5a | |
| parent | 5510500771cc45cba77469aefec2a3a790b433e9 (diff) | |
rekey --force: Incorrectly marked the new key's content as being present in the local repo even when it was not.
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | Command/ReKey.hs | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -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 |