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

todo

Browse source
This commit is contained in:
Joey Hess 2016-04-04 14:38:29 -04:00
parent 1720f9f851
commit f78cbd9f0d
Failed to extract signature
2 changed files with 58 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Annex/AdjustedBranch.hs
View file

@ -238,8 +238,9 @@ updateAdjustedBranch tomerge (origbranch, adj) commitmode = catchBoolIO $
void $ propigateAdjustedCommits' origbranch (adj, currbranch) commitsprevented
adjustedtomerge <- adjust adj mergesha
ifM (inRepo $ Git.Branch.changed currbranch adjustedtomerge)
( return $
( return $ do
-- Run after commit lock is dropped.
liftIO $ print ("autoMergeFrom", adjustedtomerge, (Just currbranch))
ifM (autoMergeFrom adjustedtomerge (Just currbranch) commitmode)
( preventCommits $ \_ ->
recommit currbranch mergesha =<< catCommit currbranch