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:
parent
79b6500111
commit
a6db10d565
5 changed files with 16 additions and 14 deletions
|
@ -174,15 +174,15 @@ commitMsg = do
|
|||
return $ "git-annex in " ++ fromMaybe "unknown" (M.lookup u m)
|
||||
|
||||
commitStaged :: Git.Branch.CommitMode -> String -> Annex Bool
|
||||
commitStaged commitmode commitmessage = go =<< inRepo Git.Branch.currentUnsafe
|
||||
where
|
||||
go Nothing = return False
|
||||
go (Just branch) = do
|
||||
runAnnexHook preCommitAnnexHook
|
||||
parent <- inRepo $ Git.Ref.sha branch
|
||||
void $ inRepo $ Git.Branch.commit commitmode False commitmessage branch
|
||||
(maybeToList parent)
|
||||
return True
|
||||
commitStaged commitmode commitmessage = do
|
||||
runAnnexHook preCommitAnnexHook
|
||||
mb <- inRepo Git.Branch.currentUnsafe
|
||||
let (getparent, branch) = case mb of
|
||||
Just b -> (Git.Ref.sha b, b)
|
||||
Nothing -> (Git.Ref.headSha, Git.Ref.headRef)
|
||||
parents <- maybeToList <$> inRepo getparent
|
||||
void $ inRepo $ Git.Branch.commit commitmode False commitmessage branch parents
|
||||
return True
|
||||
|
||||
mergeLocal :: Maybe Git.Ref -> CommandStart
|
||||
mergeLocal Nothing = stop
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue