diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-16 02:23:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-16 02:41:46 -0400 |
| commit | 9290095fc21953cd1fe0a71f7c8a454934194e3b (patch) | |
| tree | c4ac1373ca1961e5f76ba80b840491b7077c5ab9 /Upgrade/V2.hs | |
| parent | 272a67921cdc6d8d40641a9cb71b744ef1f76128 (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 'Upgrade/V2.hs')
| -rw-r--r-- | Upgrade/V2.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs index 6a46ad8a1..e76d99b3e 100644 --- a/Upgrade/V2.hs +++ b/Upgrade/V2.hs @@ -86,7 +86,7 @@ logFiles dir = return . filter (".log" `isSuffixOf`) push :: Annex () push = do - origin_master <- Annex.Branch.refExists "origin/master" + origin_master <- Annex.Branch.refExists $ Git.Ref "origin/master" origin_gitannex <- Annex.Branch.hasOrigin case (origin_master, origin_gitannex) of (_, True) -> do @@ -103,7 +103,7 @@ push = do Annex.Branch.update -- just in case showAction "pushing new git-annex branch to origin" showOutput - inRepo $ Git.run "push" [Param "origin", Param Annex.Branch.name] + inRepo $ Git.run "push" [Param "origin", Param $ show Annex.Branch.name] _ -> do -- no origin exists, so just let the user -- know about the new branch |