diff options
author | Joey Hess <id@joeyh.name> | 2013-05-13 20:11:30 -0500 |
---|---|---|
committer | Joey Hess <id@joeyh.name> | 2013-05-13 20:11:30 -0500 |
commit | 174da3515594fea9ebc1b346d8a52bfd16a443bf (patch) | |
tree | 8bcd7d29a90fa2925a4916ef6f1ab0ef8e6e193a /Remote | |
parent | 13c19fb0a0d1df6bfdd9ba2bca3eb45d624015d5 (diff) | |
parent | 1dd4574909b40ffdb77ae1338b353156d73983af (diff) |
Merge branch 'windows' of git://git-annex.branchable.com into windows
Diffstat (limited to 'Remote')
-rw-r--r-- | Remote/Git.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 0cc4da40c..3f88a0334 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -35,7 +35,7 @@ import qualified Annex.Content import qualified Annex.BranchState import qualified Annex.Branch import qualified Utility.Url as Url -import Utility.TempFile +import Utility.Tmp import Config import Config.Cost import Init @@ -179,7 +179,7 @@ tryGitConfigRead r geturlconfig headers = do s <- Url.get (Git.repoLocation r ++ "/config") headers - withTempFile "git-annex.tmp" $ \tmpfile h -> do + withTmpFile "git-annex.tmp" $ \tmpfile h -> do hPutStr h s hClose h safely $ pipedconfig "git" [Param "config", Param "--null", Param "--list", Param "--file", File tmpfile] |