summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--merge_test.go5
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