diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-26 17:04:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-26 17:04:12 -0400 |
| commit | 4b56fb237e68c99f1fcd5675910533808b0a400f (patch) | |
| tree | 5d33c04f3accc0ade64ba319e41c1244cdee023f /Annex/Branch.hs | |
| parent | b902ed74c3ac8570438f0d7eca3438f5bf5aab5f (diff) | |
remove debug print
just saw it legitimately occur when 2 git-annex were running
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 |