From 4db09814e4961fcb55843b9b51ad423560bb6e91 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 17 Jul 2012 14:50:37 -0400 Subject: avoid --no-edit with older git versions --- Git/Merge.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Git') diff --git a/Git/Merge.hs b/Git/Merge.hs index 08fc6fb48..3fda34e6c 100644 --- a/Git/Merge.hs +++ b/Git/Merge.hs @@ -10,8 +10,10 @@ module Git.Merge where import Common import Git import Git.Command +import Git.Version {- Avoids recent git's interactive merge. -} mergeNonInteractive :: Ref -> Repo -> IO Bool -mergeNonInteractive branch = runBool "merge" - [Param "--no-edit", Param $ show branch] +mergeNonInteractive branch + | older 1.7.7.6 = runBool "merge" [Param $ show branch] + | otherwise = runBool "merge" [Param "--no-edit", Param $ show branch] -- cgit v1.2.3 From 0962d50ad234f444d4e5157457fbeeb45d858d96 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 17 Jul 2012 14:51:42 -0400 Subject: typo --- Git/Merge.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Git') diff --git a/Git/Merge.hs b/Git/Merge.hs index 3fda34e6c..bad9f8258 100644 --- a/Git/Merge.hs +++ b/Git/Merge.hs @@ -15,5 +15,5 @@ import Git.Version {- Avoids recent git's interactive merge. -} mergeNonInteractive :: Ref -> Repo -> IO Bool mergeNonInteractive branch - | older 1.7.7.6 = runBool "merge" [Param $ show branch] + | older "1.7.7.6" = runBool "merge" [Param $ show branch] | otherwise = runBool "merge" [Param "--no-edit", Param $ show branch] -- cgit v1.2.3