merge from git-annex

Note that the batchCommand stuff is not used in git-repair, so
configure does not need to check for nice, ionice, and nocache,
nor are they dependend on.

1 files changed, 4 insertions, 5 deletions

diff --git a/Git/Fsck.hs b/Git/Fsck.hs
index 8555aa0..8d5b75b 100644
--- a/Git/Fsck.hs
+++ b/Git/Fsck.hs
@@ -37,17 +37,16 @@ data FsckResults = FsckFoundMissing MissingObjects | FsckFailed
  -}
 findBroken :: Bool -> Repo -> IO FsckResults
 findBroken batchmode r = do
+	let (command, params) = ("git", fsckParams r)
+	(command', params') <- if batchmode
+		then toBatchCommand (command, params)
+		else return (command, params)
 	(output, fsckok) <- processTranscript command' (toCommand params') Nothing
 	let objs = findShas output
 	badobjs <- findMissing objs r
 	if S.null badobjs && not fsckok
 		then return FsckFailed
 		else return $ FsckFoundMissing badobjs
-  where
-	(command, params) = ("git", fsckParams r)
-	(command', params')
-		| batchmode = toBatchCommand (command, params)
-		| otherwise = (command, params)
 
 foundBroken :: FsckResults -> Bool
 foundBroken FsckFailed = True