diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-06 18:40:28 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-06 18:40:28 -0400 |
| commit | 9de9f5aad4ec0275e3c544fcb26588ea0e755760 (patch) | |
| tree | 492124ae7448a3e287b0c1f4af855aec727c736b /Annex/AutoMerge.hs | |
| parent | 070b1a03392ab3962eb43f60f32fde5c1b9b70d2 (diff) | |
run out of tree merge with --no-ff
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.
Diffstat (limited to 'Annex/AutoMerge.hs')
| -rw-r--r-- | Annex/AutoMerge.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index e1662f81a..074e955d7 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -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 |