diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-01-04 17:45:27 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-01-04 17:45:27 -0400 |
| commit | f1b747e6d9fae2b365f65fd43c6295da503218bd (patch) | |
| tree | 1400863ef9a3f2bb8964e1b3f23b3bc2fdd12c8b | |
| parent | a857e1f4ee247cae0cf0ce6696a9015460d117de (diff) | |
bugfix: Running `move --to` with a remote whose UUID was not yet known
* bugfix: Running `move --to` with a remote whose UUID was not yet known
could result in git-annex not recording on the local side where the
file was moved to. This could not result in data loss, or even a
significant problem, since the remote *did* record that it had the file.
* Also, add a general guard to detect attempts to record information
about repositories with missing UUIDs.
| -rw-r--r-- | Command/Move.hs | 1 | ||||
| -rw-r--r-- | Remotes.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Command/Move.hs b/Command/Move.hs index fa847e6ba..0077618f8 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -75,6 +75,7 @@ toStart move file = isAnnexed file $ \(key, _) -> do return $ Just $ toPerform move key toPerform :: Bool -> Key -> CommandPerform toPerform move key = do + Remotes.readConfigs -- checking the remote is expensive, so not done in the start step remote <- Remotes.commandLineRemote isthere <- Remotes.inAnnex remote key diff --git a/Remotes.hs b/Remotes.hs index 17d1bd0b0..da5b3e622 100644 --- a/Remotes.hs +++ b/Remotes.hs @@ -7,8 +7,8 @@ module Remotes ( list, + readConfigs, keyPossibilities, - tryGitConfigRead, inAnnex, same, commandLineRemote, diff --git a/debian/changelog b/debian/changelog index 1c265f1be..99bcc9565 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,12 @@ git-annex (0.16) UNRELEASED; urgency=low * git-annex-shell: Avoid exposing any git repo config except for the annex.uuid when doing configlist. + * bugfix: Running `move --to` with a remote whose UUID was not yet known + could result in git-annex not recording on the local side where the + file was moved to. This could not result in data loss, or even a + significant problem, since the remote *did* record that it had the file. + * Also, add a general guard to detect attempts to record information + about repositories with missing UUIDs. -- Joey Hess <joeyh@debian.org> Tue, 04 Jan 2011 17:33:42 -0400 |