diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-01-09 18:42:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-09 18:42:29 -0400 |
| commit | 0c893f8743bab81077e3ee0fed0993b746d7a269 (patch) | |
| tree | b3ddc0665c28fadbfac58fbc43fc8a9dc85f3956 /Remote/Git.hs | |
| parent | 680e6839ee42c754a58f8e57bf15a8063a16c6bb (diff) | |
Special remotes now all rollback storage of keys that get modified during the transfer, which can happen in direct mode.
Diffstat (limited to 'Remote/Git.hs')
| -rw-r--r-- | Remote/Git.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 9b0617652..a5718e328 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -268,7 +268,7 @@ copyFromRemote r key file dest -- run copy from perspective of remote liftIO $ onLocal (repo r) $ do ensureInitialized - Annex.Content.sendAnnex key $ \object -> + Annex.Content.sendAnnex key noop $ \object -> upload u key file noRetry $ rsyncOrCopyFile params object dest | Git.repoIsSsh (repo r) = feedprogressback $ \feeder -> @@ -333,11 +333,11 @@ copyToRemote r key file p | not $ Git.repoIsUrl (repo r) = guardUsable (repo r) False $ commitOnCleanup r $ copylocal | Git.repoIsSsh (repo r) = commitOnCleanup r $ - Annex.Content.sendAnnex key $ \object -> + Annex.Content.sendAnnex key noop $ \object -> rsyncHelper (Just p) =<< rsyncParamsRemote r False key object file | otherwise = error "copying to non-ssh repo not supported" where - copylocal = Annex.Content.sendAnnex key $ \object -> do + copylocal = Annex.Content.sendAnnex key noop $ \object -> do let params = rsyncParams r u <- getUUID -- run copy from perspective of remote |