summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-09-09 16:05:45 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-09-09 16:05:45 -0400
commitc5ff422786d7a25a0b2d5680d9b85b5ff27ebd46 (patch)
treeef34e1075352ac5feef2ccdd73c08c53f6143d07 /Remote
parentd1f722e3b0b74a9d9a2e35ac1f47dbca9f7cf606 (diff)
make --json-progress update meter when getting from git remote with rsync
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Git.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 1561d7596..ff5e733ce 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -421,7 +421,7 @@ copyFromRemote :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate ->
copyFromRemote r key file dest p
| Git.repoIsHttp (repo r) = unVerified $
Annex.Content.downloadUrl key p (keyUrls r key) dest
- | otherwise = concurrentMetered (Just p) key $
+ | otherwise = commandMetered (Just p) key $
copyFromRemote' r key file dest
copyFromRemote' :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex (Bool, Verification)
@@ -531,7 +531,7 @@ copyFromRemoteCheap _ _ _ _ = return False
{- Tries to copy a key's content to a remote's annex. -}
copyToRemote :: Remote -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool
copyToRemote r key file meterupdate =
- concurrentMetered (Just meterupdate) key $
+ commandMetered (Just meterupdate) key $
copyToRemote' r key file
copyToRemote' :: Remote -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool