40ecf58d4b
This does not change the overall license of the git-annex program, which was already AGPL due to a number of sources files being AGPL already. Legally speaking, I'm adding a new license under which these files are now available; I already released their current contents under the GPL license. Now they're dual licensed GPL and AGPL. However, I intend for all my future changes to these files to only be released under the AGPL license, and I won't be tracking the dual licensing status, so I'm simply changing the license statement to say it's AGPL. (In some cases, others wrote parts of the code of a file and released it under the GPL; but in all cases I have contributed a significant portion of the code in each file and it's that code that is getting the AGPL license; the GPL license of other contributors allows combining with AGPL code.)
66 lines
1.7 KiB
Haskell
66 lines
1.7 KiB
Haskell
{- git merging
|
|
-
|
|
- Copyright 2012-2016 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Git.Merge (
|
|
MergeConfig(..),
|
|
CommitMode(..),
|
|
merge,
|
|
merge',
|
|
stageMerge,
|
|
) where
|
|
|
|
import Common
|
|
import Git
|
|
import Git.Command
|
|
import qualified Git.BuildVersion
|
|
import qualified Git.Version
|
|
import Git.Branch (CommitMode(..))
|
|
|
|
data MergeConfig
|
|
= MergeNonInteractive
|
|
-- ^ avoids recent git's interactive merge
|
|
| MergeUnrelatedHistories
|
|
-- ^ avoids recent git's prevention of merging unrelated histories
|
|
deriving (Eq)
|
|
|
|
merge :: Ref -> [MergeConfig] -> CommitMode -> Repo -> IO Bool
|
|
merge = merge' []
|
|
|
|
merge' :: [CommandParam] -> Ref -> [MergeConfig] -> CommitMode -> Repo -> IO Bool
|
|
merge' extraparams branch mergeconfig commitmode r
|
|
| MergeNonInteractive `notElem` mergeconfig || Git.BuildVersion.older "1.7.7.6" =
|
|
go [Param $ fromRef branch]
|
|
| otherwise = go [Param "--no-edit", Param $ fromRef branch]
|
|
where
|
|
go ps = merge'' (sp ++ [Param "merge"] ++ ps ++ extraparams) mergeconfig r
|
|
sp
|
|
| commitmode == AutomaticCommit =
|
|
[Param "-c", Param "commit.gpgsign=false"]
|
|
| otherwise = []
|
|
|
|
merge'' :: [CommandParam] -> [MergeConfig] -> Repo -> IO Bool
|
|
merge'' ps mergeconfig r
|
|
| MergeUnrelatedHistories `elem` mergeconfig =
|
|
ifM (Git.Version.older "2.9.0")
|
|
( go ps
|
|
, go (ps ++ [Param "--allow-unrelated-histories"])
|
|
)
|
|
| otherwise = go ps
|
|
where
|
|
go ps' = runBool ps' r
|
|
|
|
{- Stage the merge into the index, but do not commit it.-}
|
|
stageMerge :: Ref -> [MergeConfig] -> Repo -> IO Bool
|
|
stageMerge branch = merge''
|
|
[ Param "merge"
|
|
, Param "--quiet"
|
|
, Param "--no-commit"
|
|
-- Without this, a fast-forward merge is done, since it involves no
|
|
-- commit.
|
|
, Param "--no-ff"
|
|
, Param $ fromRef branch
|
|
]
|