Merge branch 'master' into smudge
This commit is contained in:
commit
62a2fba1cd
23 changed files with 283 additions and 26 deletions
|
@ -27,9 +27,10 @@ replaceFile :: FilePath -> (FilePath -> Annex ()) -> Annex ()
|
|||
replaceFile file action = do
|
||||
misctmpdir <- fromRepo gitAnnexTmpMiscDir
|
||||
void $ createAnnexDirectory misctmpdir
|
||||
let basetmp = takeFileName file
|
||||
filemax <- liftIO $ fileNameLengthLimit misctmpdir
|
||||
let basetmp = take (filemax `div` 2) (takeFileName file)
|
||||
withTmpDirIn misctmpdir basetmp $ \tmpdir -> do
|
||||
let tmpfile = tmpdir <> basetmp
|
||||
let tmpfile = tmpdir </> basetmp
|
||||
action tmpfile
|
||||
liftIO $ replaceFileFrom tmpfile file
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue