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

remove debug

Browse source
This commit is contained in:
Joey Hess 2016-02-29 17:36:20 -04:00
parent 70e65db751
commit a97a9aaaee
Failed to extract signature
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Annex/AdjustedBranch.hs
View file

@ -129,8 +129,7 @@ commitAdjustedTree treesha parent = go =<< catCommit parent
{- Update the currently checked out adjusted branch, merging the provided {- Update the currently checked out adjusted branch, merging the provided
- branch into it. -} - branch into it. -}
updateAdjustedBranch :: Branch -> (OrigBranch, Adjustment) -> Git.Branch.CommitMode -> Annex Bool updateAdjustedBranch :: Branch -> (OrigBranch, Adjustment) -> Git.Branch.CommitMode -> Annex Bool
updateAdjustedBranch tomerge (origbranch, adj) commitmode = do updateAdjustedBranch tomerge (origbranch, adj) commitmode =
liftIO $ print ("updateAdjustedBranch", tomerge)
go =<< (,) go =<< (,)
<$> inRepo (Git.Ref.sha tomerge) <$> inRepo (Git.Ref.sha tomerge)
<*> inRepo Git.Branch.current <*> inRepo Git.Branch.current
@ -139,7 +138,6 @@ updateAdjustedBranch tomerge (origbranch, adj) commitmode = do
( do ( do
propigateAdjustedCommits origbranch adj propigateAdjustedCommits origbranch adj
adjustedtomerge <- adjust adj mergesha adjustedtomerge <- adjust adj mergesha
liftIO $ print ("mergesha", mergesha, "adjustedtomerge", adjustedtomerge)
ifM (inRepo $ Git.Branch.changed currbranch adjustedtomerge) ifM (inRepo $ Git.Branch.changed currbranch adjustedtomerge)
( ifM (autoMergeFrom adjustedtomerge (Just currbranch) commitmode) ( ifM (autoMergeFrom adjustedtomerge (Just currbranch) commitmode)
( recommit currbranch mergesha =<< catCommit currbranch ( recommit currbranch mergesha =<< catCommit currbranch