diff options
Diffstat (limited to 'Annex/Branch.hs')
| -rw-r--r-- | Annex/Branch.hs | 3 |
1 files changed, 1 insertions, 2 deletions
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 |