diff options
| author | Carlos Martín Nieto <[email protected]> | 2016-03-07 11:17:10 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2016-03-07 11:22:53 +0100 |
| commit | 2ae7d13ba1037c7fa579fc52263ea280b37244ea (patch) | |
| tree | f2509df04ec4e6187943aad83ea672e660102a8b /merge_test.go | |
| parent | fa644d2fc9efa3baee93b525212d76dfa17a5db5 (diff) | |
| parent | e095c85fd06b5820d2f0098ff3e66b266553dbd5 (diff) | |
Merge branch 'next'
Diffstat (limited to 'merge_test.go')
| -rw-r--r-- | merge_test.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/merge_test.go b/merge_test.go index ad01319..8059727 100644 --- a/merge_test.go +++ b/merge_test.go @@ -115,7 +115,10 @@ func appendCommit(t *testing.T, repo *Repository) (*Oid, *Oid) { parent, err := ref.Peel(ObjectCommit) checkFatal(t, err) - commitId, err := repo.CreateCommit("HEAD", sig, sig, message, tree, parent.(*Commit)) + parentCommit, err := parent.AsCommit() + checkFatal(t, err) + + commitId, err := repo.CreateCommit("HEAD", sig, sig, message, tree, parentCommit) checkFatal(t, err) return commitId, treeId |