diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-14 14:30:15 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-14 14:47:08 -0400 |
| commit | 8f2cde77f63fe873341554192b1c7df71cc8bdc1 (patch) | |
| tree | c3858d3491fce3732db2e6abacb91df1dd552b0e /Command/Lock.hs | |
| parent | 1835f915174e9fdf5aa73372efa80e4330b528f2 (diff) | |
Preserve execute bits of unlocked files in v6 mode.
When annex.thin is set, adding an object will add the execute bits to the
work tree file, and this does mean that the annex object file ends up
executable.
This doesn't add any complexity that wasn't already present, because git
annex add of an executable file has always ingested it so that the annex
object ends up executable.
But, since an annex object file can be executable or not, when populating
an unlocked file from one, the executable bit is always added or removed
to match the mode of the pointer file.
Diffstat (limited to 'Command/Lock.hs')
| -rw-r--r-- | Command/Lock.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Lock.hs b/Command/Lock.hs index f002f016a..1cd50de7b 100644 --- a/Command/Lock.hs +++ b/Command/Lock.hs @@ -78,7 +78,7 @@ performNew file key filemodified = do mfc <- withTSDelta (liftIO . genInodeCache file) unlessM (sameInodeCache obj (maybeToList mfc)) $ do modifyContent obj $ replaceFile obj $ \tmp -> do - unlessM (checkedCopyFile key obj tmp) $ + unlessM (checkedCopyFile key obj tmp Nothing) $ error "unable to lock file" Database.Keys.storeInodeCaches key [obj] @@ -92,7 +92,7 @@ performNew file key filemodified = do liftIO $ nukeFile obj case mfile of Just unmodified -> - unlessM (checkedCopyFile key unmodified obj) + unlessM (checkedCopyFile key unmodified obj Nothing) lostcontent Nothing -> lostcontent | otherwise = modifyContent obj $ |