mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid git warning about CRLF in restagePointerFile

Browse source 
Saw it on Windows, could probably also happen on linux with some
configuration. Since this is a pointer file, the warning does not apply.
This commit is contained in:
Joey Hess 2019-02-18 18:06:35 -04:00
parent 1647b9c7a4
commit 1e95bc4fd1
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Annex/Link.hs
View file

@ -27,6 +27,7 @@ import qualified Git.Env
import qualified Git import qualified Git
import Git.Types import Git.Types
import Git.FilePath import Git.FilePath
import Git.Config
import Annex.HashObject import Annex.HashObject
import Annex.InodeSentinal import Annex.InodeSentinal
import Utility.FileMode import Utility.FileMode
@ -203,7 +204,12 @@ restagePointerFile (Restage True) f orig = withTSDelta $ \tsd -> do
let updatetmpindex = do let updatetmpindex = do
r' <- Git.Env.addGitEnv r Git.Index.indexEnv r' <- Git.Env.addGitEnv r Git.Index.indexEnv
=<< Git.Index.indexEnvVal tmpindex =<< Git.Index.indexEnvVal tmpindex
Git.UpdateIndex.refreshIndex r' $ \feed -> -- Avoid git warning about CRLF munging.
let r'' = r' { gitGlobalOpts = gitGlobalOpts r' ++
[ Param "-c"
, Param $ "core.safecrlf=" ++ boolConfig False
] }
Git.UpdateIndex.refreshIndex r'' $ \feed ->
forM_ l $ \(f', checkunmodified) -> forM_ l $ \(f', checkunmodified) ->
whenM checkunmodified $ whenM checkunmodified $
feed f' feed f'

2
doc/bugs/windows_support_totally_bitrotted.mdwn
View file

@ -27,3 +27,5 @@ returned Nothing which should not happen in this case.
So, the next step will be to build git-annex on Windows and instrument So, the next step will be to build git-annex on Windows and instrument
`stageDirect` to work out which thing it depends on has broken.. `stageDirect` to work out which thing it depends on has broken..
> [[fixed|done]] --[[Joey]]