diff options
| author | Michael Muré <batolettre@gmail.com> | 2021-01-03 23:59:25 +0100 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2021-02-14 12:19:00 +0100 |
| commit | 8d63c983c982f93cc48d3996d6bd097ddeeb327f (patch) | |
| tree | 94d85594e11965f9780df53a5c0c2b2550c02184 /bug | |
| parent | 4ef92efeb905102d37b81fafa0ac2173594ef30a (diff) | |
| download | git-bug-8d63c983c982f93cc48d3996d6bd097ddeeb327f.tar.gz | |
WIP
Diffstat (limited to 'bug')
| -rw-r--r-- | bug/bug.go | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -426,7 +426,7 @@ func (bug *Bug) Commit(repo repository.ClockedRepo) error { // Write a Git commit referencing the tree, with the previous commit as parent if bug.lastCommit != "" { - hash, err = repo.StoreCommitWithParent(hash, bug.lastCommit) + hash, err = repo.StoreCommit(hash, bug.lastCommit) } else { hash, err = repo.StoreCommit(hash) } @@ -524,7 +524,7 @@ func (bug *Bug) Merge(repo repository.Repo, other Interface) (bool, error) { } // create a new commit with the correct ancestor - hash, err := repo.StoreCommitWithParent(treeHash, bug.lastCommit) + hash, err := repo.StoreCommit(treeHash, bug.lastCommit) if err != nil { return false, err |