diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-26 17:06:43 -0700 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-26 17:10:25 -0700 |
| commit | f04fc3ca095f2372c9bb43ef5b884ed112d34eff (patch) | |
| tree | 71b7b1ea09f7f1d7bf964544c1c04eb7259abf15 /Remote | |
| parent | 7924eb9422a949bbca80d7abc516eba0d9467f14 (diff) | |
Do not preserve permissions and acls when copying files from one local git repository to another. Timestamps are still preserved as long as cp --preserve=timestamps is supported.
This avoids cp -a overriding the default mode acls that the user might have
set in a git repository.
With GNU cp, this behavior change should not be a breaking change, because
git-anex also uses rsync sometimes in the same situation, and has only ever
preserved timestamps when using rsync.
Systems without GNU cp will no longer use cp -a, but instead just cp.
So, timestamps will no longer be preserved. Preserving timestamps when
copying between repos is not guaranteed anyway.
Closes: #729757
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Git.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index bf796ec11..0c760c3aa 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -543,7 +543,7 @@ rsyncOrCopyFile rsyncparams src dest p = docopy = liftIO $ bracket (forkIO $ watchfilesize zeroBytesProcessed) (void . tryIO . killThread) - (const $ copyFileExternal src dest) + (const $ copyFileExternal CopyTimeStamps src dest) watchfilesize oldsz = do threadDelay 500000 -- 0.5 seconds v <- catchMaybeIO $ |