git-annex/Git/Merge.hs

{- git merging
 -
 - Copyright 2012 Joey Hess <joey@kitenet.net>
 -
 - Licensed under the GNU GPL version 3 or higher.
 -}

module Git.Merge where

import Common
import Git
import Git.Command
import Git.BuildVersion

{- Avoids recent git's interactive merge. -}
mergeNonInteractive :: Ref -> Repo -> IO Bool
mergeNonInteractive branch
	| older "1.7.7.6" = merge [Param $ fromRef branch]
	| otherwise = merge [Param "--no-edit", Param $ fromRef branch]
  where
	merge ps = runBool $ Param "merge" : ps
sync: Avoid recent git's interactive merge. 2012-06-23 14:22:56 +00:00			`{- git merging`
			`-`
			`- Copyright 2012 Joey Hess <joey@kitenet.net>`
			`-`
			`- Licensed under the GNU GPL version 3 or higher.`
			`-}`

			`module Git.Merge where`

			`import Common`
			`import Git`
			`import Git.Command`
better git version checking 2013-08-02 22:31:01 +00:00			`import Git.BuildVersion`
sync: Avoid recent git's interactive merge. 2012-06-23 14:22:56 +00:00
			`{- Avoids recent git's interactive merge. -}`
			`mergeNonInteractive :: Ref -> Repo -> IO Bool`
avoid --no-edit with older git versions 2012-07-17 18:50:37 +00:00			`mergeNonInteractive branch`
remove Read instance for Ref Removed instance, got it all to build using fromRef. (With a few things that really need to show something using a ref for debugging stubbed out.) Then added back Read instance, and made Logs.View use it for serialization. This changes the view log format. 2014-02-19 05:09:17 +00:00			`\| older "1.7.7.6" = merge [Param $ fromRef branch]`
			`\| otherwise = merge [Param "--no-edit", Param $ fromRef branch]`
git subcommand cleanup Pass subcommand as a regular param, which allows passing git parameters like -c before it. This was already done in the pipeing set of functions, but not the command running set. 2013-03-03 17:39:07 +00:00			`where`
			`merge ps = runBool $ Param "merge" : ps`