diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-17 00:18:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-17 00:18:07 -0400 |
| commit | e8188ea611e4c9223492203c0ec0370c3c45b225 (patch) | |
| tree | 2a078993be28d1dedc38f8ab9ad193eea0ecf90e /Git | |
| parent | ba744c84a4f683e50bf4c9b8c388e3a611f7fb91 (diff) | |
flip catchDefaultIO
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Command.hs | 2 | ||||
| -rw-r--r-- | Git/Construct.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Git/Command.hs b/Git/Command.hs index 431569559..687f6802c 100644 --- a/Git/Command.hs +++ b/Git/Command.hs @@ -79,7 +79,7 @@ pipeNullSplit params repo = reap :: IO () reap = do -- throws an exception when there are no child processes - catchDefaultIO (getAnyProcessStatus False True) Nothing + catchDefaultIO Nothing (getAnyProcessStatus False True) >>= maybe noop (const reap) {- Runs a git command as a coprocess. -} diff --git a/Git/Construct.hs b/Git/Construct.hs index ce12f9b66..3c1cfdbdf 100644 --- a/Git/Construct.hs +++ b/Git/Construct.hs @@ -224,7 +224,7 @@ checkForRepo dir = <&&> doesDirectoryExist (dir </> "objects") gitDirFile = do c <- firstLine <$> - catchDefaultIO (readFile $ dir </> ".git") "" + catchDefaultIO "" (readFile $ dir </> ".git") return $ if gitdirprefix `isPrefixOf` c then Just $ Local { gitdir = drop (length gitdirprefix) c |