diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-01-11 16:06:19 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-01-11 16:06:19 -0400 |
| commit | 196c2fa78633aaaf9a43c8aa6a54b4144ffac3e2 (patch) | |
| tree | ac46499157c587c04666ba3405b4bd73f54afed0 | |
| parent | a8ce30401dd69d1d203cfc33b791c1b4d175666e (diff) | |
Bugfix: `copy --to` and `move --to` forgot to stage location log changes after transferring the file to the remote repository. (Did not affect ssh remotes.)
| -rw-r--r-- | Remotes.hs | 7 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Remotes.hs b/Remotes.hs index 2c8cdfdad..a7a1db415 100644 --- a/Remotes.hs +++ b/Remotes.hs @@ -252,8 +252,11 @@ copyToRemote r key -- run copy from perspective of remote liftIO $ do a <- Annex.new r [] - Annex.eval a $ Core.getViaTmp key $ \f -> - liftIO $ copyFile keysrc f + Annex.eval a $ do + ok <- Core.getViaTmp key $ + \f -> liftIO $ copyFile keysrc f + Annex.queueRun + return ok | Git.repoIsSsh r = do g <- Annex.gitRepo let keysrc = annexLocation g key diff --git a/debian/changelog b/debian/changelog index 9ae31edc7..96acc592c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +git-annex (0.18) UNRELEASED; urgency=low + + * Bugfix: `copy --to` and `move --to` forgot to stage location log changes + after transferring the file to the remote repository. + (Did not affect ssh remotes.) + + -- Joey Hess <joeyh@debian.org> Tue, 11 Jan 2011 16:05:25 -0400 + git-annex (0.17) unstable; urgency=low * unannex: Now skips files whose content is not present, rather than |