From 2b0b3ca7e8cd1b659f21757a6036758d24be445e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 10 Dec 2013 16:17:52 -0400 Subject: merge from git-annex --- git-repair.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git-repair.hs') diff --git a/git-repair.hs b/git-repair.hs index 0aedc27..847ef0c 100644 --- a/git-repair.hs +++ b/git-repair.hs @@ -59,7 +59,7 @@ main = execParser opts >>= go repair :: Settings -> IO () repair settings = do g <- Git.Config.read =<< Git.CurrentRepo.get - ifM (Git.Repair.successfulRepair <$> Git.Repair.runRepair (forced settings) g) + ifM (Git.Repair.successfulRepair <$> Git.Repair.runRepair Git.Repair.isTrackingBranch (forced settings) g) ( exitSuccess , exitFailure ) @@ -94,7 +94,7 @@ runTest settings damage = withTmpDir "tmprepo" $ \tmpdir -> do g <- Git.Config.read =<< Git.Construct.fromPath cloneloc Git.Destroyer.applyDamage damage g repairstatus <- catchMaybeIO $ Git.Repair.successfulRepair - <$> Git.Repair.runRepair (forced settings) g + <$> Git.Repair.runRepair Git.Repair.isTrackingBranch (forced settings) g case repairstatus of Just True -> testResult repairstatus . Just . not . Git.Fsck.foundBroken -- cgit v1.2.3