Always use filesystem encoding for all file and handle reads and writes.
This is a big scary change. I have convinced myself it should be safe. I hope!
This commit is contained in:
parent
c89a9e6ca5
commit
8484c0c197
48 changed files with 75 additions and 109 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue