diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-26 18:29:34 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-26 18:29:34 +0100 |
| commit | dc7efa1aef2d3694e7a1955d746d26013402a21d (patch) | |
| tree | 53fe478631e02e372508d981093c2abace29ce42 /tests/diff/submodules.c | |
| parent | 77b699e0da3d4a4fed742893bd172f3ee7b936d5 (diff) | |
| parent | 591e82952a2835c3d411ee5abec78be3b0816861 (diff) | |
| download | libgit2-dc7efa1aef2d3694e7a1955d746d26013402a21d.tar.gz | |
Merge pull request #2204 from libgit2/rb/submodule-reference-counting
Make submodules externally refcounted
Diffstat (limited to 'tests/diff/submodules.c')
| -rw-r--r-- | tests/diff/submodules.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/diff/submodules.c b/tests/diff/submodules.c index 314cf1fad..80dfcaa3f 100644 --- a/tests/diff/submodules.c +++ b/tests/diff/submodules.c @@ -131,7 +131,7 @@ void test_diff_submodules__dirty_submodule_2(void) g_repo = setup_fixture_submodules(); - cl_git_pass(git_submodule_reload_all(g_repo)); + cl_git_pass(git_submodule_reload_all(g_repo, 1)); opts.flags = GIT_DIFF_INCLUDE_UNTRACKED | GIT_DIFF_SHOW_UNTRACKED_CONTENT | @@ -165,7 +165,7 @@ void test_diff_submodules__dirty_submodule_2(void) git_diff_free(diff); - cl_git_pass(git_submodule_reload_all(g_repo)); + cl_git_pass(git_submodule_reload_all(g_repo, 1)); cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); check_diff_patches(diff, expected_dirty); @@ -291,7 +291,9 @@ void test_diff_submodules__invalid_cache(void) check_diff_patches(diff, expected_dirty); git_diff_free(diff); - cl_git_pass(git_submodule_reload_all(g_repo)); + git_submodule_free(sm); + + cl_git_pass(git_submodule_reload_all(g_repo, 1)); cl_git_pass(git_submodule_lookup(&sm, g_repo, smpath)); cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); @@ -344,6 +346,8 @@ void test_diff_submodules__invalid_cache(void) p_unlink("submod2/sm_changed_head/new_around_here"); + git_submodule_free(sm); + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); check_diff_patches(diff, expected_moved); git_diff_free(diff); |