From e0518a4adc250da1ad088c4362016627e1effb08 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 27 Nov 2010 17:07:22 -0400 Subject: [PATCH] Fix bug in setkey subcommand triggered by move --to. --- Command/SetKey.hs | 5 ++++- debian/changelog | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Command/SetKey.hs b/Command/SetKey.hs index 685872f73d..55472ccaed 100644 --- a/Command/SetKey.hs +++ b/Command/SetKey.hs @@ -35,7 +35,10 @@ perform :: FilePath -> Key -> SubCmdPerform perform file key = do -- the file might be on a different filesystem, so mv is used -- rather than simply calling moveToObjectDir key file - ok <- getViaTmp key $ \dest -> liftIO $ boolSystem "mv" [file, dest] + ok <- getViaTmp key $ \dest -> do + if dest /= file + then liftIO $ boolSystem "mv" [file, dest] + else return True if ok then return $ Just $ cleanup key else error "mv failed!" diff --git a/debian/changelog b/debian/changelog index 6e5e7ef488..75f4f9f0ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ git-annex (0.09) UNRELEASED; urgency=low * Add copy subcommand. + * Fix bug in setkey subcommand triggered by move --to. -- Joey Hess Sat, 27 Nov 2010 16:58:33 -0400