diff options
| author | Michael Muré <michael.mure@consensys.net> | 2019-02-06 22:06:42 +0100 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2019-03-01 22:40:23 +0100 |
| commit | 21048e785d976a04e26798e4a385ee675c95b88f (patch) | |
| tree | b525d1f5a45e8c828b140b26f6dcc3f7eb5af123 /bug/bug.go | |
| parent | 328a4e5abf3ec8ea41f89575fcfb83cf9f086c80 (diff) | |
| download | git-bug-21048e785d976a04e26798e4a385ee675c95b88f.tar.gz | |
identity: wip
Diffstat (limited to 'bug/bug.go')
| -rw-r--r-- | bug/bug.go | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -459,6 +459,7 @@ func (bug *Bug) Commit(repo repository.ClockedRepo) error { return err } + bug.staging.commitHash = hash bug.packs = append(bug.packs, bug.staging) bug.staging = OperationPack{} @@ -513,9 +514,8 @@ func (bug *Bug) Merge(repo repository.Repo, other Interface) (bool, error) { } ancestor, err := repo.FindCommonAncestor(bug.lastCommit, otherBug.lastCommit) - if err != nil { - return false, err + return false, errors.Wrap(err, "can't find common ancestor") } ancestorIndex := 0 |