Windows: Fix bug introduced in last release that caused files in the git-annex branch to have lines teminated with \r.
This commit is contained in:
parent
d69c78483c
commit
1ab3d7c810
2 changed files with 8 additions and 1 deletions
|
@ -40,7 +40,12 @@ setJournalFile _jl file content = do
|
|||
jfile <- fromRepo $ journalFile file
|
||||
let tmpfile = tmp </> takeFileName jfile
|
||||
liftIO $ do
|
||||
writeFileAnyEncoding tmpfile content
|
||||
withFile tmpfile WriteMode $ \h -> do
|
||||
fileEncoding h
|
||||
#ifdef mingw32_HOST_OS
|
||||
hSetNewlineMode h noNewlineTranslation
|
||||
#endif
|
||||
hPutStr h content
|
||||
moveFile tmpfile jfile
|
||||
|
||||
{- Gets any journalled content for a file in the branch. -}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue