mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

remove debug print

Browse source 
just saw it legitimately occur when 2 git-annex were running
This commit is contained in:
Joey Hess 2014-01-26 17:04:12 -04:00
parent 819e1511de
commit 2ecd42b43b
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Annex/Branch.hs
View file

@ -252,8 +252,7 @@ commitIndex' jl branchref message parents = do
committedref <- inRepo $ Git.Branch.commitAlways message fullname parents committedref <- inRepo $ Git.Branch.commitAlways message fullname parents
setIndexSha committedref setIndexSha committedref
parentrefs <- commitparents <$> catObject committedref parentrefs <- commitparents <$> catObject committedref
when (racedetected branchref parentrefs) $ do when (racedetected branchref parentrefs) $
liftIO $ print ("race detected", branchref, parentrefs, "committing", (branchref, parents))
fixrace committedref parentrefs fixrace committedref parentrefs
where where
-- look for "parent ref" lines and return the refs -- look for "parent ref" lines and return the refs