sync: Fix committing when in a direct mode repo that has no HEAD ref.

Seen for example, a newly checked out git submodule. In this case,
.git/HEAD is a raw sha, rather than the usual reference to a ref.

Removed currentSha in passing, since it was a more roundabout way of
doing what headSha does, and headSha is more robust.
This commit is contained in:
Joey Hess 2015-03-04 15:25:13 -04:00
parent 79b6500111
commit a6db10d565
5 changed files with 16 additions and 14 deletions

View file

@ -43,9 +43,6 @@ currentUnsafe r = parse . firstLine
| null l = Nothing
| otherwise = Just $ Git.Ref l
currentSha :: Repo -> IO (Maybe Git.Sha)
currentSha r = maybe (pure Nothing) (`Git.Ref.sha` r) =<< current r
{- Checks if the second branch has any commits not present on the first
- branch. -}
changed :: Branch -> Branch -> Repo -> IO Bool