diff options
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Import.hs | 2 | ||||
| -rw-r--r-- | Command/TestRemote.hs | 2 | ||||
| -rw-r--r-- | Command/Unannex.hs | 2 | ||||
| -rw-r--r-- | Command/Unlock.hs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Command/Import.hs b/Command/Import.hs index db3601a1b..97e3f7652 100644 --- a/Command/Import.hs +++ b/Command/Import.hs @@ -90,7 +90,7 @@ start mode (srcfile, destfile) = handleexisting =<< liftIO (catchMaybeIO $ getSymbolicLinkStatus destfile) liftIO $ createDirectoryIfMissing True (parentDir destfile) liftIO $ if mode == Duplicate || mode == SkipDuplicates - then void $ copyFileExternal srcfile destfile + then void $ copyFileExternal CopyAllMetaData srcfile destfile else moveFile srcfile destfile Command.Add.perform destfile handleexisting Nothing = noop diff --git a/Command/TestRemote.hs b/Command/TestRemote.hs index 1cb1929e0..247a243e4 100644 --- a/Command/TestRemote.hs +++ b/Command/TestRemote.hs @@ -136,7 +136,7 @@ test st r k = , check "retrieveKeyFile resume from end" $ do loc <- Annex.calcRepo (gitAnnexLocation k) tmp <- prepTmp k - void $ liftIO $ copyFileExternal loc tmp + void $ liftIO $ copyFileExternal CopyAllMetaData loc tmp lockContent k removeAnnex get , check "fsck downloaded object" fsck diff --git a/Command/Unannex.hs b/Command/Unannex.hs index 9cb88564c..c105eb9ce 100644 --- a/Command/Unannex.hs +++ b/Command/Unannex.hs @@ -89,7 +89,7 @@ cleanupIndirect file key = do ) where copyfrom src = - thawContent file `after` liftIO (copyFileExternal src file) + thawContent file `after` liftIO (copyFileExternal CopyAllMetaData src file) hardlinkfrom src = #ifndef mingw32_HOST_OS -- creating a hard link could fall; fall back to copying diff --git a/Command/Unlock.hs b/Command/Unlock.hs index 19a1b258f..02704e805 100644 --- a/Command/Unlock.hs +++ b/Command/Unlock.hs @@ -46,7 +46,7 @@ perform dest key = do tmpdest <- fromRepo $ gitAnnexTmpObjectLocation key liftIO $ createDirectoryIfMissing True (parentDir tmpdest) showAction "copying" - ifM (liftIO $ copyFileExternal src tmpdest) + ifM (liftIO $ copyFileExternal CopyAllMetaData src tmpdest) ( do liftIO $ do removeFile dest |