diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-13 15:08:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-13 15:08:44 -0400 |
| commit | 25b2cc4148e4cc8f7435cdbcf4b124cc317c1305 (patch) | |
| tree | 51f22dc7c65bb38574c4682ec16ca7a552d96cf6 /Annex | |
| parent | 13fff71f2019ae098c3f8532ac2734cb1ab11498 (diff) | |
move commit to Git.Branch
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Branch.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index f9fa6cbb3..a2ecd50a7 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -71,7 +71,7 @@ getBranch = maybe (hasOrigin >>= go >>= use) (return) =<< branchsha fromMaybe (error $ "failed to create " ++ show name) <$> branchsha go False = withIndex' True $ do - inRepo $ Git.commit "branch created" fullname [] + inRepo $ Git.Branch.commit "branch created" fullname [] use sha = do setIndexSha sha return sha @@ -190,7 +190,7 @@ commit message = whenM journalDirty $ lockJournal $ do commitBranch :: Git.Ref -> String -> [Git.Ref] -> Annex () commitBranch branchref message parents = do updateIndex branchref - committedref <- inRepo $ Git.commit message fullname parents + committedref <- inRepo $ Git.Branch.commit message fullname parents setIndexSha committedref parentrefs <- commitparents <$> catObject committedref when (racedetected branchref parentrefs) $ |