1 files changed, 25 insertions, 21 deletions

diff --git a/tests/merge/trees/analysis.c b/tests/merge/trees/analysis.c
index a905e34ed..ce61085e3 100644
--- a/tests/merge/trees/analysis.c
+++ b/tests/merge/trees/analysis.c
@@ -1,12 +1,14 @@
-// NOTE: this is essentially duplicated from tests/merge/workdir/analysis.c
-// You probably want to make changes to both files.
+/*
+NOTE: this is essentially duplicated from tests/merge/workdir/analysis.c
+You probably want to make changes to both files.
+*/
 
 #include "clar_libgit2.h"
 #include "git2/repository.h"
 #include "../analysis.h"
 
-static git_repository *base_repo;
 static git_repository *repo;
+static git_repository *bare_repo;
 static git_index *repo_index;
 
 #define TEST_REPO_PATH "merge-resolve"
@@ -16,68 +18,70 @@ static git_index *repo_index;
 /* Fixture setup and teardown */
 void test_merge_trees_analysis__initialize(void)
 {
-    base_repo = cl_git_sandbox_init(TEST_REPO_PATH);
+	repo = cl_git_sandbox_init(TEST_REPO_PATH);
 
-    cl_git_pass(git_repository_open_ext(&repo, TEST_REPO_PATH "/.git", GIT_REPOSITORY_OPEN_BARE, NULL));
+	cl_git_pass(git_repository_open_ext(&bare_repo, TEST_REPO_PATH "/.git", GIT_REPOSITORY_OPEN_BARE, NULL));
 
-    git_repository_index(&repo_index, repo);
+	git_repository_index(&repo_index, bare_repo);
 
-    testimpl_merge_analysis__initialize(repo, repo_index);
+	testimpl_merge_analysis__initialize(bare_repo, repo_index);
 }
 
 void test_merge_trees_analysis__cleanup(void)
 {
-    testimpl_merge_analysis__cleanup();
+	testimpl_merge_analysis__cleanup();
 
-    git_index_free(repo_index);
+	git_index_free(repo_index);
+	repo_index = NULL;
 
-    git_repository_free(repo);
-    repo = NULL;
+	git_repository_free(bare_repo);
+	bare_repo = NULL;
 
-    cl_git_sandbox_cleanup();
+	cl_git_sandbox_cleanup();
+	repo = NULL;
 }
 
 void test_merge_trees_analysis__fastforward(void)
 {
-    testimpl_merge_analysis__fastforward();
+	testimpl_merge_analysis__fastforward();
 }
 
 void test_merge_trees_analysis__no_fastforward(void)
 {
-    testimpl_merge_analysis__no_fastforward();
+	testimpl_merge_analysis__no_fastforward();
 }
 
 void test_merge_trees_analysis__uptodate(void)
 {
-    testimpl_merge_analysis__uptodate();
+	testimpl_merge_analysis__uptodate();
 }
 
 void test_merge_trees_analysis__uptodate_merging_prev_commit(void)
 {
-    testimpl_merge_analysis__uptodate_merging_prev_commit();
+	testimpl_merge_analysis__uptodate_merging_prev_commit();
 }
 
 void test_merge_trees_analysis__unborn(void)
 {
-    testimpl_merge_analysis__unborn();
+	testimpl_merge_analysis__unborn();
 }
 
 void test_merge_trees_analysis__fastforward_with_config_noff(void)
 {
-    testimpl_merge_analysis__fastforward_with_config_noff();
+	testimpl_merge_analysis__fastforward_with_config_noff();
 }
 
 void test_merge_trees_analysis__no_fastforward_with_config_ffonly(void)
 {
-    testimpl_merge_analysis__no_fastforward_with_config_ffonly();
+	testimpl_merge_analysis__no_fastforward_with_config_ffonly();
 }
 
 void test_merge_trees_analysis__between_uptodate_refs(void)
 {
-    testimpl_merge_analysis__between_uptodate_refs();
+	testimpl_merge_analysis__between_uptodate_refs();
 }
 
 void test_merge_trees_analysis__between_noff_refs(void)
 {
-    testimpl_merge_analysis__between_noff_refs();
+	testimpl_merge_analysis__between_noff_refs();
 }