sync: Avoid recent git's interactive merge.

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

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]

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