merge from git-annex

1 files changed, 7 insertions, 3 deletions

diff --git a/Git/Types.hs b/Git/Types.hs
index e63e930..8029225 100644
--- a/Git/Types.hs
+++ b/Git/Types.hs
@@ -47,16 +47,20 @@ type RemoteName = String
 
 {- A git ref. Can be a sha1, or a branch or tag name. -}
 newtype Ref = Ref String
-	deriving (Eq, Ord)
+	deriving (Eq, Ord, Read, Show)
 
-instance Show Ref where
-	show (Ref v) = v
+fromRef :: Ref -> String
+fromRef (Ref s) = s
 
 {- Aliases for Ref. -}
 type Branch = Ref
 type Sha = Ref
 type Tag = Ref
 
+{- A date in the format described in gitrevisions. Includes the
+ - braces, eg, "{yesterday}" -}
+newtype RefDate = RefDate String
+
 {- Types of objects that can be stored in git. -}
 data ObjectType = BlobObject | CommitObject | TreeObject
 	deriving (Eq)