40 lines
1 KiB
Haskell
40 lines
1 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2014 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.ResolveMerge where
|
|
|
|
import Common.Annex
|
|
import Command
|
|
import qualified Git
|
|
import Git.Sha
|
|
import qualified Git.Branch
|
|
import Annex.AutoMerge
|
|
|
|
cmd :: [Command]
|
|
cmd = [command "resolvemerge" paramNothing seek SectionPlumbing
|
|
"resolve merge conflicts"]
|
|
|
|
seek :: CommandSeek
|
|
seek = withNothing start
|
|
|
|
start :: CommandStart
|
|
start = do
|
|
showStart "resolvemerge" ""
|
|
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)
|
|
( do
|
|
void $ commitResolvedMerge Git.Branch.ManualCommit
|
|
next $ next $ return True
|
|
, error "Merge conflict could not be automatically resolved."
|
|
)
|
|
where
|
|
nobranch = error "No branch is currently checked out."
|
|
nomergehead = error "No SHA found in .git/merge_head"
|