mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

bugfix: Running copy --to when both local and remote had the key dropped it from local.

Browse source
This commit is contained in:
Joey Hess 2011-01-07 02:14:22 -04:00
parent 71a8278f9c
commit e43d4730c5
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Move.hs
View file

@ -89,7 +89,7 @@ toPerform move key = do
if ok if ok
then return $ Just $ toCleanup move remote key then return $ Just $ toCleanup move remote key
else return Nothing -- failed 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 :: Bool -> Git.Repo -> Key -> CommandCleanup
toCleanup move remote key = do toCleanup move remote key = do
remoteHasKey remote key True remoteHasKey remote key True

4
debian/changelog vendored
View file

@ -9,7 +9,9 @@ git-annex (0.16) UNRELEASED; urgency=low
* Also, add a general guard to detect attempts to record information * Also, add a general guard to detect attempts to record information
about repositories with missing UUIDs. about repositories with missing UUIDs.
* bugfix: Running `move --to` with a non-ssh remote failed. * 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 -- Joey Hess <joeyh@debian.org> Tue, 04 Jan 2011 17:33:42 -0400