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 /Command/VPop.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 'Command/VPop.hs')
| -rw-r--r-- | Command/VPop.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Command/VPop.hs b/Command/VPop.hs index c95701580..baa52a98f 100644 --- a/Command/VPop.hs +++ b/Command/VPop.hs @@ -9,6 +9,7 @@ module Command.VPop where import Common.Annex import Command +import qualified Git import qualified Git.Command import qualified Git.Ref import Types.View @@ -41,7 +42,7 @@ start ps = go =<< currentView showOutput inRepo $ Git.Command.runBool [ Param "checkout" - , Param $ show $ Git.Ref.base $ + , Param $ Git.fromRef $ Git.Ref.base $ viewParentBranch v ] sameparentbranch a b = viewParentBranch a == viewParentBranch b |