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

Always use filesystem encoding for all file and handle reads and writes.

Browse source 
This is a big scary change. I have convinced myself it should be safe. I
hope!
This commit is contained in:
Joey Hess 2016-12-24 14:46:31 -04:00
parent c89a9e6ca5
commit 8484c0c197
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
48 changed files with 75 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
git-union-merge.hs
View file

@ -14,6 +14,7 @@ import qualified Git.CurrentRepo
import qualified Git.Branch
import qualified Git.Index
import qualified Git
import Utility.FileSystemEncoding
header :: String
header = "Usage: git-union-merge ref ref newref"
@ -39,6 +40,7 @@ parseArgs = do
main :: IO ()
main = do
useFileSystemEncoding
[aref, bref, newref] <- map Git.Ref <$> parseArgs
g <- Git.Config.read =<< Git.CurrentRepo.get
_ <- Git.Index.override (tmpIndex g) g