From e43d4730c5157acd5ccc421472b33d0f12167a2c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 Jan 2011 02:14:22 -0400
Subject: [PATCH] bugfix: Running `copy --to` when both local and remote had
the key dropped it from local.
---
Command/Move.hs | 2 +-
debian/changelog | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Command/Move.hs b/Command/Move.hs
index 0077618f8b..3e7fde3705 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -89,7 +89,7 @@ toPerform move key = do
if ok
then return $ Just $ toCleanup move remote key
else return Nothing -- failed
- Right True -> return $ Just $ Command.Drop.cleanup key
+ Right True -> return $ Just $ toCleanup move remote key
toCleanup :: Bool -> Git.Repo -> Key -> CommandCleanup
toCleanup move remote key = do
remoteHasKey remote key True
diff --git a/debian/changelog b/debian/changelog
index 969935a4e9..18aea04670 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,9 @@ git-annex (0.16) UNRELEASED; urgency=low
* Also, add a general guard to detect attempts to record information
about repositories with missing UUIDs.
* bugfix: Running `move --to` with a non-ssh remote failed.
- * Test suite improvements. Current top-level test coverage: 57%
+ * bugfix: Running `copy --to` when both local and remote had the key
+ dropped it from local.
+ * Test suite improvements. Current top-level test coverage: 62%
-- Joey Hess <joeyh@debian.org> Tue, 04 Jan 2011 17:33:42 -0400