diff options
| author | Joey Hess <joey@kitenet.net> | 2014-10-12 14:32:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-12 14:32:56 -0400 |
| commit | efef527d5b2e42e261fa7af6947aad6553426ebe (patch) | |
| tree | 082a5dad993557e9dffd76a69d4087371da8ed42 /Git/Command.hs | |
| parent | ab1cf3570207bd08ae0abbba183a8c570c0361f5 (diff) | |
| download | git-repair-efef527d5b2e42e261fa7af6947aad6553426ebe.tar.gz | |
Merge from git-annex.
Includes changing to new exceptions library, and some whitespace fixes.
Diffstat (limited to 'Git/Command.hs')
| -rw-r--r-- | Git/Command.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Git/Command.hs b/Git/Command.hs index 30d2dcb..c61cc9f 100644 --- a/Git/Command.hs +++ b/Git/Command.hs @@ -79,7 +79,7 @@ pipeWriteRead params writer repo = assertLocal repo $ writeReadProcessEnv "git" (toCommand $ gitCommandLine params repo) (gitEnv repo) writer (Just adjusthandle) where - adjusthandle h = do + adjusthandle h = do fileEncoding h hSetNewlineMode h noNewlineTranslation @@ -117,7 +117,7 @@ gitCoProcessStart restartable params repo = CoProcess.start numrestarts "git" (toCommand $ gitCommandLine params repo) (gitEnv repo) where - {- If a long-running git command like cat-file --batch + {- If a long-running git command like cat-file --batch - crashes, it will likely start up again ok. If it keeps crashing - 10 times, something is badly wrong. -} numrestarts = if restartable then 10 else 0 |