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

9
Git/Merge.hs
View file

@ -15,12 +15,15 @@ import Git.Branch (CommitMode(..))
{- Avoids recent git's interactive merge. -}
mergeNonInteractive :: Ref -> CommitMode -> Repo -> IO Bool
mergeNonInteractive branch commitmode
mergeNonInteractive = mergeNonInteractive' []
mergeNonInteractive' :: [CommandParam] -> Ref -> CommitMode -> Repo -> IO Bool
mergeNonInteractive' extraparams branch commitmode
| older "1.7.7.6" = merge [Param $ fromRef branch]
| otherwise = merge $ [Param "--no-edit", Param $ fromRef branch]
where
merge ps = runBool $ cp ++ [Param "merge"] ++ ps
cp
merge ps = runBool $ sp ++ [Param "merge"] ++ ps ++ extraparams
sp
| commitmode == AutomaticCommit =
[Param "-c", Param "commit.gpgsign=false"]
| otherwise = []