diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-23 10:22:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-23 10:22:56 -0400 |
| commit | c79e3b67e9e55817992d2d0c72fd6f01a6a403ec (patch) | |
| tree | 3632838125b3e624ed2fb222f64bc0251dfee26e | |
| parent | 3118eeb63fbd5ae6565c49c1e8d14f61b6f8f810 (diff) | |
sync: Avoid recent git's interactive merge.
| -rw-r--r-- | Command/Sync.hs | 3 | ||||
| -rw-r--r-- | Git/Merge.hs | 17 | ||||
| -rw-r--r-- | debian/changelog | 1 |
3 files changed, 20 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index 5fb49d30c..1da6b0b81 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -16,6 +16,7 @@ import qualified Remote import qualified Annex import qualified Annex.Branch import qualified Git.Command +import qualified Git.Merge import qualified Git.Branch import qualified Git.Ref import qualified Git @@ -157,7 +158,7 @@ mergeAnnex = do mergeFrom :: Git.Ref -> CommandCleanup mergeFrom branch = do showOutput - inRepo $ Git.Command.runBool "merge" [Param $ show branch] + inRepo $ Git.Merge.mergeNonInteractive branch changed :: Remote -> Git.Ref -> Annex Bool changed remote b = do diff --git a/Git/Merge.hs b/Git/Merge.hs new file mode 100644 index 000000000..08fc6fb48 --- /dev/null +++ b/Git/Merge.hs @@ -0,0 +1,17 @@ +{- 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 + +{- Avoids recent git's interactive merge. -} +mergeNonInteractive :: Ref -> Repo -> IO Bool +mergeNonInteractive branch = runBool "merge" + [Param "--no-edit", Param $ show branch] diff --git a/debian/changelog b/debian/changelog index 5d8d973c6..a580f88bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ git-annex (3.20120616) UNRELEASED; urgency=low Available on Linux, BSDs, and OSX! * Enable diskfree on kfreebsd, using kqueue. * unused: Fix crash when key names contain invalid utf8. + * sync: Avoid recent git's interactive merge. -- Joey Hess <joeyh@debian.org> Tue, 12 Jun 2012 11:35:59 -0400 |