summaryrefslogtreecommitdiff
path: root/tests-clar/merge/fastforward.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2012-12-12 09:02:28 -0600
committerEdward Thomson <ethomson@edwardthomson.com>2012-12-12 09:02:28 -0600
commitc6ad440250d6c438cc622df42ced436199e03dac (patch)
treec96e94358b00ff3043844a2b7f825100b9a1963d /tests-clar/merge/fastforward.c
parentc52573f62b4935aaf1b16c689adb904b09f5570e (diff)
downloadlibgit2-merge.tar.gz
fix some memleaksmerge
Diffstat (limited to 'tests-clar/merge/fastforward.c')
-rw-r--r--tests-clar/merge/fastforward.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests-clar/merge/fastforward.c b/tests-clar/merge/fastforward.c
index 71cc815d0..b650695a2 100644
--- a/tests-clar/merge/fastforward.c
+++ b/tests-clar/merge/fastforward.c
@@ -41,6 +41,9 @@ static git_merge_result *merge_fastforward_branch(int flags)
cl_git_pass(git_merge(&result, repo, (const git_merge_head **)their_heads, 1, &opts));
+ git_merge_head_free(their_heads[0]);
+ git_reference_free(their_ref);
+
return result;
}
@@ -79,7 +82,7 @@ void test_merge_fastforward__no_fastforward(void)
cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
cl_assert(git_index_reuc_entrycount(repo_index) == 0);
-
+
git_merge_result_free(result);
}
@@ -96,5 +99,6 @@ void test_merge_fastforward__uptodate(void)
cl_assert(git_merge_result_is_uptodate(result));
+ git_merge_head_free(their_heads[0]);
git_merge_result_free(result);
}