summaryrefslogtreecommitdiff
path: root/git-union-merge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-11-16 02:23:34 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-11-16 02:41:46 -0400
commit9290095fc21953cd1fe0a71f7c8a454934194e3b (patch)
treec4ac1373ca1961e5f76ba80b840491b7077c5ab9 /git-union-merge.hs
parent272a67921cdc6d8d40641a9cb71b744ef1f76128 (diff)
improve type signatures with a Ref newtype
In git, a Ref can be a Sha, or a Branch, or a Tag. I added type aliases for those. Note that this does not prevent mixing up of eg, refs and branches at the type level. Since git really doesn't care, except rare cases like git update-ref, or git tag -d, that seems ok for now. There's also a tree-ish, but let's just use Ref for it. A given Sha or Ref may or may not be a tree-ish, depending on the object type, so there seems no point in trying to represent it at the type level.
Diffstat (limited to 'git-union-merge.hs')
-rw-r--r--git-union-merge.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs
index 10ae84217..1cec4a0f8 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -37,7 +37,7 @@ parseArgs = do
main :: IO ()
main = do
- [aref, bref, newref] <- parseArgs
+ [aref, bref, newref] <- map Git.Ref <$> parseArgs
g <- Git.configRead =<< Git.repoFromCwd
_ <- Git.useIndex (tmpIndex g)
setup g