f97c783283
This new approach allows filtering out checks from the default set that are not appropriate for a command, rather than having to list every check that is appropriate. It also reduces some boilerplate. Haskell does not define Eq for functions, so I had to go a long way around with each check having a unique id. Meh.
29 lines
537 B
Haskell
29 lines
537 B
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2011 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.Merge where
|
|
|
|
import Common.Annex
|
|
import Command
|
|
import qualified Annex.Branch
|
|
|
|
def :: [Command]
|
|
def = [command "merge" paramNothing seek
|
|
"auto-merge remote changes into git-annex branch"]
|
|
|
|
seek :: [CommandSeek]
|
|
seek = [withNothing start]
|
|
|
|
start :: CommandStart
|
|
start = do
|
|
showStart "merge" "."
|
|
next perform
|
|
|
|
perform :: CommandPerform
|
|
perform = do
|
|
Annex.Branch.update
|
|
next $ return True
|