diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-13 00:29:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-13 00:29:06 -0400 |
| commit | de6406afce6de0cf8a48bc2ecf9be1e7de93e40e (patch) | |
| tree | 08705fab60c11d4073734a8c2500a88b1aab7852 /Utility/CopyFile.hs | |
| parent | 3e55a8f164d67d5bd1ef86ae2f38fb2c6c3a51b2 (diff) | |
| parent | 94554782894ec6c26da3b46312d5d1d16d596458 (diff) | |
Merge branch 'master' into desymlink
Conflicts:
Annex/CatFile.hs
Annex/Content.hs
Git/LsFiles.hs
Git/LsTree.hs
Diffstat (limited to 'Utility/CopyFile.hs')
| -rw-r--r-- | Utility/CopyFile.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Utility/CopyFile.hs b/Utility/CopyFile.hs index 66b88e4f0..18290669d 100644 --- a/Utility/CopyFile.hs +++ b/Utility/CopyFile.hs @@ -17,9 +17,9 @@ copyFileExternal src dest = do whenM (doesFileExist dest) $ removeFile dest boolSystem "cp" $ params ++ [File src, File dest] - where - params = map snd $ filter fst - [ (SysConfig.cp_reflink_auto, Param "--reflink=auto") - , (SysConfig.cp_a, Param "-a") - , (SysConfig.cp_p && not SysConfig.cp_a, Param "-p") - ] + where + params = map snd $ filter fst + [ (SysConfig.cp_reflink_auto, Param "--reflink=auto") + , (SysConfig.cp_a, Param "-a") + , (SysConfig.cp_p && not SysConfig.cp_a, Param "-p") + ] |