diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-19 01:09:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-19 01:19:57 -0400 |
| commit | 51c12a76ef54affaf9428232fde4f2c3e30e7488 (patch) | |
| tree | 4cb2699e2b410260e383d3bf6da14d502aa0d0dc /Git/Merge.hs | |
| parent | b5b5ead4b28fd08100bcac9cb9482263bac3a64e (diff) | |
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.
Diffstat (limited to 'Git/Merge.hs')
| -rw-r--r-- | Git/Merge.hs | 4 |
1 files changed, 2 insertions, 2 deletions
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 |