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.)
40 lines
1 KiB
Haskell
40 lines
1 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2014 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.ResolveMerge where
|
|
|
|
import Command
|
|
import qualified Git
|
|
import Git.Sha
|
|
import qualified Git.Branch
|
|
import Annex.AutoMerge
|
|
|
|
cmd :: Command
|
|
cmd = command "resolvemerge" SectionPlumbing
|
|
"resolve merge conflicts"
|
|
paramNothing (withParams seek)
|
|
|
|
seek :: CmdParams -> CommandSeek
|
|
seek = withNothing (commandAction start)
|
|
|
|
start :: CommandStart
|
|
start = do
|
|
showStart' "resolvemerge" Nothing
|
|
us <- fromMaybe nobranch <$> inRepo Git.Branch.current
|
|
d <- fromRepo Git.localGitDir
|
|
let merge_head = d </> "MERGE_HEAD"
|
|
them <- fromMaybe (error nomergehead) . extractSha
|
|
<$> liftIO (readFile merge_head)
|
|
ifM (resolveMerge (Just us) them False)
|
|
( do
|
|
void $ commitResolvedMerge Git.Branch.ManualCommit
|
|
next $ next $ return True
|
|
, giveup "Merge conflict could not be automatically resolved."
|
|
)
|
|
where
|
|
nobranch = giveup "No branch is currently checked out."
|
|
nomergehead = giveup "No SHA found in .git/merge_head"
|