diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-24 14:46:31 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-24 14:46:31 -0400 |
| commit | 3b9d9a267b7c9247d36d9b622e1b836724ca5fb0 (patch) | |
| tree | 7c57f49555835e462e0f69ba133bbfdaaf215368 /git-union-merge.hs | |
| parent | 2aba1975e8192e7c60ef85118b40654b60cad027 (diff) | |
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!
Diffstat (limited to 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs index 3bf628c75..18c88b1a9 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -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 |