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/Uninit.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/Uninit.hs')
| -rw-r--r-- | Command/Uninit.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Uninit.hs b/Command/Uninit.hs index 3bf6dbe00..1c8d08689 100644 --- a/Command/Uninit.hs +++ b/Command/Uninit.hs @@ -24,7 +24,7 @@ check :: Annex () check = do b <- current_branch when (b == Annex.Branch.name) $ error $ - "cannot uninit when the " ++ show b ++ " branch is checked out" + "cannot uninit when the " ++ Git.fromRef b ++ " branch is checked out" top <- fromRepo Git.repoPath cwd <- liftIO getCurrentDirectory whenM ((/=) <$> liftIO (absPath top) <*> liftIO (absPath cwd)) $ @@ -77,7 +77,7 @@ finish = do -- avoid normal shutdown saveState False inRepo $ Git.Command.run - [Param "branch", Param "-D", Param $ show Annex.Branch.name] + [Param "branch", Param "-D", Param $ Git.fromRef Annex.Branch.name] liftIO exitSuccess {- Keys that were moved out of the annex have a hard link still in the |