From 4b56fb237e68c99f1fcd5675910533808b0a400f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 Jan 2014 17:04:12 -0400 Subject: remove debug print just saw it legitimately occur when 2 git-annex were running --- Annex/Branch.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Annex/Branch.hs') diff --git a/Annex/Branch.hs b/Annex/Branch.hs index 3256b65fb..391e82ae6 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -252,8 +252,7 @@ commitIndex' jl branchref message parents = do committedref <- inRepo $ Git.Branch.commitAlways message fullname parents setIndexSha committedref parentrefs <- commitparents <$> catObject committedref - when (racedetected branchref parentrefs) $ do - liftIO $ print ("race detected", branchref, parentrefs, "committing", (branchref, parents)) + when (racedetected branchref parentrefs) $ fixrace committedref parentrefs where -- look for "parent ref" lines and return the refs -- cgit v1.2.3