From 51c12a76ef54affaf9428232fde4f2c3e30e7488 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 19 Feb 2014 01:09:17 -0400 Subject: 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. --- Git/Merge.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Git/Merge.hs') diff --git a/Git/Merge.hs b/Git/Merge.hs index f5791274f..948e09e01 100644 --- a/Git/Merge.hs +++ b/Git/Merge.hs @@ -15,7 +15,7 @@ import Git.BuildVersion {- Avoids recent git's interactive merge. -} mergeNonInteractive :: Ref -> Repo -> IO Bool mergeNonInteractive branch - | older "1.7.7.6" = merge [Param $ show branch] - | otherwise = merge [Param "--no-edit", Param $ show 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 -- cgit v1.2.3