Skip to content

G
git2
Commit 0b3aa7be by Carlos Martín Nieto
Options

tests: plug leaks

parent 96c9b9f0
Showing with 3 additions and 0 deletions
tests-clar/checkout/tree.c
...@@ -379,6 +379,8 @@ void assert_conflict( ...@@ -379,6 +379,8 @@ void assert_conflict(
/* Make HEAD point to this branch */ /* Make HEAD point to this branch */
cl_git_pass(git_reference_symbolic_create( cl_git_pass(git_reference_symbolic_create(
&head, g_repo, "HEAD", git_reference_name(branch), 1)); &head, g_repo, "HEAD", git_reference_name(branch), 1));
git_reference_free(head);
git_reference_free(branch);
/* Checkout the parent */ /* Checkout the parent */
opts.checkout_strategy = GIT_CHECKOUT_FORCE; opts.checkout_strategy = GIT_CHECKOUT_FORCE;
...@@ -408,6 +410,7 @@ void assert_conflict( ...@@ -408,6 +410,7 @@ void assert_conflict(
/* Stage the conflicting change */ /* Stage the conflicting change */
cl_git_pass(git_index_add_from_workdir(index, entry_path)); cl_git_pass(git_index_add_from_workdir(index, entry_path));
cl_git_pass(git_index_write(index)); cl_git_pass(git_index_write(index));
git_index_free(index);
cl_assert_equal_i( cl_assert_equal_i(
GIT_EMERGECONFLICT, git_checkout_tree(g_repo, g_object, &g_opts)); GIT_EMERGECONFLICT, git_checkout_tree(g_repo, g_object, &g_opts));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment