diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-17 14:31:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-17 14:31:42 -0400 |
| commit | 0edf9cafa3112fe4cf7b740b9b0f797b89acdbee (patch) | |
| tree | af5d1a06ebbee54797c4bf115f8303acb5fa743e /Remote/Git.hs | |
| parent | e7e07730cd988917a52693278b797a781feb0754 (diff) | |
Bring back rsync -p, but only when git-annex is running on a non-crippled file system. This is a better approach to fix #700282 while not unncessarily losing file permissions on non-crippled systems.
Diffstat (limited to 'Remote/Git.hs')
| -rw-r--r-- | Remote/Git.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 209312d67..83964e180 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -312,7 +312,7 @@ copyFromRemote r key file dest _p = copyFromRemote' r key file dest copyFromRemote' :: Remote -> Key -> AssociatedFile -> FilePath -> Annex Bool copyFromRemote' r key file dest | not $ Git.repoIsUrl (repo r) = guardUsable (repo r) False $ do - let params = Ssh.rsyncParams r Download + params <- Ssh.rsyncParams r Download u <- getUUID -- run copy from perspective of remote onLocal r $ do @@ -411,7 +411,7 @@ copyToRemote r key file p -- the remote's Annex, but it needs access to the current -- Annex monad's state. checksuccessio <- Annex.withCurrentState checksuccess - let params = Ssh.rsyncParams r Upload + params <- Ssh.rsyncParams r Upload u <- getUUID -- run copy from perspective of remote onLocal r $ ifM (Annex.Content.inAnnex key) |