diff options
| author | Joey Hess <joey@kitenet.net> | 2013-12-10 16:17:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-10 16:17:52 -0400 |
| commit | 2b0b3ca7e8cd1b659f21757a6036758d24be445e (patch) | |
| tree | 4e0359257bdcf0b8a3e2b1f4823489e0a64951d0 /git-repair.hs | |
| parent | 444a4dad77289265296d1fa76e060c46497ec6c8 (diff) | |
| download | git-repair-2b0b3ca7e8cd1b659f21757a6036758d24be445e.tar.gz | |
merge from git-annex
Diffstat (limited to 'git-repair.hs')
| -rw-r--r-- | git-repair.hs | 4 |
1 files changed, 2 insertions, 2 deletions
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 |