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

run out of tree merge with --no-ff

Browse source 
This is how direct mode does it too, and somehow, for reasons that
currently escape me, this makes git merge not care if it's run with an
empty work tree.
This commit is contained in:
Joey Hess 2016-04-06 18:40:28 -04:00
parent 60bdffe43e
commit 887ef93a7f
Failed to extract signature
5 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Annex/AutoMerge.hs
View file

@ -42,8 +42,8 @@ import qualified Data.ByteString.Lazy as L
- Callers should use Git.Branch.changed first, to make sure that
- there are changes from the current branch to the branch being merged in.
-}
autoMergeFrom :: Git.Ref -> Maybe Git.Ref -> Bool -> Git.Branch.CommitMode -> Annex Bool
autoMergeFrom branch currbranch inoverlay commitmode = do
autoMergeFrom :: Git.Ref -> Maybe Git.Ref -> Git.Branch.CommitMode -> Annex Bool
autoMergeFrom branch currbranch commitmode = do
showOutput
case currbranch of
Nothing -> go Nothing
@ -52,7 +52,7 @@ autoMergeFrom branch currbranch inoverlay commitmode = do
go old = ifM isDirect
( mergeDirect currbranch old branch (resolveMerge old branch False) commitmode
, inRepo (Git.Merge.mergeNonInteractive branch commitmode)
<||> (resolveMerge old branch inoverlay <&&> commitResolvedMerge commitmode)
<||> (resolveMerge old branch False <&&> commitResolvedMerge commitmode)
)
{- Resolves a conflicted merge. It's important that any conflicts be