Convert usage of `git_buf_free` to new `git_buf_dispose`

11 files changed, 77 insertions, 77 deletions

diff --git a/tests/diff/binary.c b/tests/diff/binary.c
index 173a5994e..711fe6473 100644
--- a/tests/diff/binary.c
+++ b/tests/diff/binary.c
@@ -57,7 +57,7 @@ void test_patch(
 
 	cl_assert_equal_s(expected, actual.ptr);
 
-	git_buf_free(&actual);
+	git_buf_dispose(&actual);
 	git_patch_free(patch);
 	git_diff_free(diff);
 	git_tree_free(tree_one);
@@ -238,7 +238,7 @@ void test_diff_binary__delta(void)
 		expected);
 
 	git_index_free(index);
-	git_buf_free(&contents);
+	git_buf_dispose(&contents);
 }
 
 void test_diff_binary__delta_append(void)
@@ -298,7 +298,7 @@ void test_diff_binary__empty_for_no_diff(void)
 
 	cl_assert_equal_s("", actual.ptr);
 
-	git_buf_free(&actual);
+	git_buf_dispose(&actual);
 	git_diff_free(diff);
 	git_commit_free(commit);
 	git_tree_free(tree);
@@ -346,7 +346,7 @@ void test_diff_binary__index_to_workdir(void)
 		&opts,
 		expected);
 
-	git_buf_free(&actual);
+	git_buf_dispose(&actual);
 	git_patch_free(patch);
 	git_diff_free(diff);
 	git_index_free(index);
@@ -402,7 +402,7 @@ void test_diff_binary__print_patch_from_diff(void)
 
 	cl_assert_equal_s(expected, actual.ptr);
 
-	git_buf_free(&actual);
+	git_buf_dispose(&actual);
 	git_diff_free(diff);
 	git_index_free(index);
 }
@@ -540,6 +540,6 @@ void test_diff_binary__blob_to_blob(void)
 	git__free(diff_data.old_path);
 	git__free(diff_data.new_path);
 
-	git_buf_free(&diff_data.old_binary_base85);
-	git_buf_free(&diff_data.new_binary_base85);
+	git_buf_dispose(&diff_data.old_binary_base85);
+	git_buf_dispose(&diff_data.new_binary_base85);
 }
diff --git a/tests/diff/blob.c b/tests/diff/blob.c
index 05cc28218..a876a973d 100644
--- a/tests/diff/blob.c
+++ b/tests/diff/blob.c
@@ -101,7 +101,7 @@ void test_diff_blob__patch_with_freed_blobs(void)
 	cl_assert_equal_s(buf.ptr, BLOB_DIFF);
 
 	git_patch_free(p);
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_blob__can_compare_text_blobs(void)
@@ -1016,7 +1016,7 @@ void test_diff_blob__using_path_and_attributes(void)
 	git_buf_clear(&buf);
 	git_patch_free(p);
 
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 	git_blob_free(nonbin);
 	git_blob_free(bin);
 }
diff --git a/tests/diff/diffiter.c b/tests/diff/diffiter.c
index c976e30e2..432201b7f 100644
--- a/tests/diff/diffiter.c
+++ b/tests/diff/diffiter.c
@@ -423,7 +423,7 @@ void test_diff_diffiter__iterate_and_generate_patch_text(void)
 
 		cl_assert_equal_s(expected_patch_text[d], buf.ptr);
 
-		git_buf_free(&buf);
+		git_buf_dispose(&buf);
 		git_patch_free(patch);
 	}
 
diff --git a/tests/diff/drivers.c b/tests/diff/drivers.c
index 42af38a9a..cace40967 100644
--- a/tests/diff/drivers.c
+++ b/tests/diff/drivers.c
@@ -65,7 +65,7 @@ void test_diff_drivers__patterns(void)
 	cl_git_pass(git_patch_to_buf(&actual, patch));
 	cl_assert_equal_s(expected0, actual.ptr);
 
-	git_buf_free(&actual);
+	git_buf_dispose(&actual);
 	git_patch_free(patch);
 	git_diff_free(diff);
 
@@ -80,7 +80,7 @@ void test_diff_drivers__patterns(void)
 	cl_git_pass(git_patch_to_buf(&actual, patch));
 	cl_assert_equal_s(expected1, actual.ptr);
 
-	git_buf_free(&actual);
+	git_buf_dispose(&actual);
 	git_patch_free(patch);
 	git_diff_free(diff);
 
@@ -95,7 +95,7 @@ void test_diff_drivers__patterns(void)
 	cl_git_pass(git_patch_to_buf(&actual, patch));
 	cl_assert_equal_s(expected0, actual.ptr);
 
-	git_buf_free(&actual);
+	git_buf_dispose(&actual);
 	git_patch_free(patch);
 	git_diff_free(diff);
 
@@ -112,7 +112,7 @@ void test_diff_drivers__patterns(void)
 	cl_git_pass(git_patch_to_buf(&actual, patch));
 	cl_assert_equal_s(expected1, actual.ptr);
 
-	git_buf_free(&actual);
+	git_buf_dispose(&actual);
 	git_patch_free(patch);
 	git_diff_free(diff);
 
@@ -133,7 +133,7 @@ void test_diff_drivers__patterns(void)
 	cl_git_pass(git_patch_to_buf(&actual, patch));
 	cl_assert_equal_s(expected2, actual.ptr);
 
-	git_buf_free(&actual);
+	git_buf_dispose(&actual);
 	git_patch_free(patch);
 	git_diff_free(diff);
 
@@ -169,7 +169,7 @@ void test_diff_drivers__long_lines(void)
 
 	cl_assert_equal_s(expected, actual.ptr);
 
-	git_buf_free(&actual);
+	git_buf_dispose(&actual);
 	git_patch_free(patch);
 	git_diff_free(diff);
 }
@@ -245,9 +245,9 @@ void test_diff_drivers__builtins(void)
 		git__free(path);
 	}
 
-	git_buf_free(&file);
-	git_buf_free(&actual);
-	git_buf_free(&expected);
+	git_buf_dispose(&file);
+	git_buf_dispose(&actual);
+	git_buf_dispose(&expected);
 	git_vector_free(&files);
 }
 
diff --git a/tests/diff/format_email.c b/tests/diff/format_email.c
index c3c04107b..28f840ab0 100644
--- a/tests/diff/format_email.c
+++ b/tests/diff/format_email.c
@@ -49,7 +49,7 @@ static void assert_email_match(
 
 	git_diff_free(diff);
 	git_commit_free(commit);
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_format_email__simple(void)
@@ -255,7 +255,7 @@ void test_diff_format_email__multiple(void)
 
 	git_diff_free(diff);
 	git_commit_free(commit);
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_format_email__exclude_marker(void)
@@ -331,7 +331,7 @@ void test_diff_format_email__invalid_no(void)
 
 	git_diff_free(diff);
 	git_commit_free(commit);
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_format_email__mode_change(void)
diff --git a/tests/diff/parse.c b/tests/diff/parse.c
index dc2ceefec..bb18196b0 100644
--- a/tests/diff/parse.c
+++ b/tests/diff/parse.c
@@ -54,7 +54,7 @@ static void test_parse_invalid_diff(const char *invalid_diff)
 	cl_git_fail_with(GIT_ERROR,
 		git_diff_from_buffer(&diff, buf.ptr, buf.size));
 
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_parse__exact_rename(void)
@@ -125,7 +125,7 @@ static void test_tree_to_tree_computed_to_parsed(
 	git_diff_free(computed);
 	git_diff_free(parsed);
 
-	git_buf_free(&computed_buf);
+	git_buf_dispose(&computed_buf);
 
 	cl_git_sandbox_cleanup();
 }
@@ -213,7 +213,7 @@ void test_diff_parse__get_patch_from_diff(void)
 	git_diff_free(computed);
 	git_diff_free(parsed);
 
-	git_buf_free(&computed_buf);
+	git_buf_dispose(&computed_buf);
 
 	cl_git_sandbox_cleanup();
 }
@@ -265,7 +265,7 @@ void test_diff_parse__parsing_minimal_patch_succeeds(void)
 	cl_assert_equal_s(patch, buf.ptr);
 
 	git_diff_free(diff);
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_parse__patch_roundtrip_succeeds(void)
@@ -285,6 +285,6 @@ void test_diff_parse__patch_roundtrip_succeeds(void)
 
 	git_patch_free(patch);
 	git_diff_free(diff);
-	git_buf_free(&patchbuf);
-	git_buf_free(&diffbuf);
+	git_buf_dispose(&patchbuf);
+	git_buf_dispose(&diffbuf);
 }
diff --git a/tests/diff/patch.c b/tests/diff/patch.c
index 4c836289d..bc7976fe0 100644
--- a/tests/diff/patch.c
+++ b/tests/diff/patch.c
@@ -171,7 +171,7 @@ void test_diff_patch__to_string(void)
 	cl_assert_equal_sz(31 + 16, git_patch_size(patch, 1, 1, 0));
 	cl_assert_equal_sz(strlen(expected), git_patch_size(patch, 1, 1, 1));
 
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 	git_patch_free(patch);
 	git_diff_free(diff);
 	git_tree_free(another);
@@ -252,7 +252,7 @@ void test_diff_patch__config_options(void)
 	git_patch_free(patch);
 	git_diff_free(diff);
 
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 	git_tree_free(one);
 	git_config_free(cfg);
 }
@@ -440,8 +440,8 @@ void test_diff_patch__hunks_have_correct_line_numbers(void)
 	git_patch_free(patch);
 	git_diff_free(diff);
 
-	git_buf_free(&actual);
-	git_buf_free(&old_content);
+	git_buf_dispose(&actual);
+	git_buf_dispose(&old_content);
 	git_tree_free(head);
 }
 
@@ -476,7 +476,7 @@ static void check_single_patch_stats(
 		git_buf buf = GIT_BUF_INIT;
 		cl_git_pass(git_patch_to_buf(&buf, patch));
 		cl_assert_equal_s(expected, buf.ptr);
-		git_buf_free(&buf);
+		git_buf_dispose(&buf);
 
 		cl_assert_equal_sz(
 			strlen(expected), git_patch_size(patch, 1, 1, 1));
@@ -614,7 +614,7 @@ void test_diff_patch__line_counts_with_eofnl(void)
 	check_single_patch_stats(
 		g_repo, 1, 1, 1, 6, expected_sizes, expected);
 
-	git_buf_free(&content);
+	git_buf_dispose(&content);
 }
 
 void test_diff_patch__can_strip_bad_utf8(void)
@@ -700,5 +700,5 @@ void test_diff_patch__can_strip_bad_utf8(void)
 	cl_assert_equal_s(expected, buf.ptr);
 
 	git_patch_free(patch);
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
diff --git a/tests/diff/rename.c b/tests/diff/rename.c
index ddc1d5d78..0ba9330ac 100644
--- a/tests/diff/rename.c
+++ b/tests/diff/rename.c
@@ -603,8 +603,8 @@ void test_diff_rename__working_directory_changes(void)
 	git_diff_free(diff);
 
 	git_tree_free(tree);
-	git_buf_free(&content);
-	git_buf_free(&old_content);
+	git_buf_dispose(&content);
+	git_buf_dispose(&old_content);
 }
 
 void test_diff_rename__patch(void)
@@ -645,7 +645,7 @@ void test_diff_rename__patch(void)
 
 	cl_git_pass(git_patch_to_buf(&buf, patch));
 	cl_assert_equal_s(expected, buf.ptr);
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 
 	git_patch_free(patch);
 
@@ -707,8 +707,8 @@ void test_diff_rename__file_exchange(void)
 	git_tree_free(tree);
 	git_index_free(index);
 
-	git_buf_free(&c1);
-	git_buf_free(&c2);
+	git_buf_dispose(&c1);
+	git_buf_dispose(&c2);
 }
 
 void test_diff_rename__file_exchange_three(void)
@@ -759,9 +759,9 @@ void test_diff_rename__file_exchange_three(void)
 	git_tree_free(tree);
 	git_index_free(index);
 
-	git_buf_free(&c1);
-	git_buf_free(&c2);
-	git_buf_free(&c3);
+	git_buf_dispose(&c1);
+	git_buf_dispose(&c2);
+	git_buf_dispose(&c3);
 }
 
 void test_diff_rename__file_partial_exchange(void)
@@ -812,8 +812,8 @@ void test_diff_rename__file_partial_exchange(void)
 	git_tree_free(tree);
 	git_index_free(index);
 
-	git_buf_free(&c1);
-	git_buf_free(&c2);
+	git_buf_dispose(&c1);
+	git_buf_dispose(&c2);
 }
 
 void test_diff_rename__rename_and_copy_from_same_source(void)
@@ -869,8 +869,8 @@ void test_diff_rename__rename_and_copy_from_same_source(void)
 	git_tree_free(tree);
 	git_index_free(index);
 
-	git_buf_free(&c1);
-	git_buf_free(&c2);
+	git_buf_dispose(&c1);
+	git_buf_dispose(&c2);
 }
 
 void test_diff_rename__from_deleted_to_split(void)
@@ -923,7 +923,7 @@ void test_diff_rename__from_deleted_to_split(void)
 	git_tree_free(tree);
 	git_index_free(index);
 
-	git_buf_free(&c1);
+	git_buf_dispose(&c1);
 }
 
 struct rename_expected
@@ -1023,8 +1023,8 @@ void test_diff_rename__rejected_match_can_match_others(void)
 	git_index_free(index);
 	git_reference_free(head);
 	git_reference_free(selfsimilar);
-	git_buf_free(&one);
-	git_buf_free(&two);
+	git_buf_dispose(&one);
+	git_buf_dispose(&two);
 }
 
 static void write_similarity_file_two(const char *filename, size_t b_lines)
@@ -1041,7 +1041,7 @@ static void write_similarity_file_two(const char *filename, size_t b_lines)
 	cl_git_pass(
 		git_futils_writebuffer(&contents, filename, O_RDWR|O_CREAT, 0777));
 
-	git_buf_free(&contents);
+	git_buf_dispose(&contents);
 }
 
 void test_diff_rename__rejected_match_can_match_others_two(void)
@@ -1389,7 +1389,7 @@ void test_diff_rename__can_find_copy_to_split(void)
 	git_tree_free(tree);
 	git_index_free(index);
 
-	git_buf_free(&c1);
+	git_buf_dispose(&c1);
 }
 
 void test_diff_rename__can_delete_unmodified_deltas(void)
@@ -1437,7 +1437,7 @@ void test_diff_rename__can_delete_unmodified_deltas(void)
 	git_tree_free(tree);
 	git_index_free(index);
 
-	git_buf_free(&c1);
+	git_buf_dispose(&c1);
 }
 
 void test_diff_rename__matches_config_behavior(void)
@@ -1759,7 +1759,7 @@ void test_diff_rename__identical(void)
 
 	cl_assert_equal_s(expected, diff_buf.ptr);
 
-	git_buf_free(&diff_buf);
+	git_buf_dispose(&diff_buf);
 	git_diff_free(diff);
 	git_tree_free(old_tree);
 	git_tree_free(new_tree);
@@ -1910,7 +1910,7 @@ void test_diff_rename__rewrite_and_delete(void)
 
 	cl_assert_equal_s(expected, diff_buf.ptr);
 
-	git_buf_free(&diff_buf);
+	git_buf_dispose(&diff_buf);
 	git_diff_free(diff);
 	git_tree_free(old_tree);
 	git_tree_free(new_tree);
@@ -1973,7 +1973,7 @@ void test_diff_rename__delete_and_rename(void)
 
 	cl_assert_equal_s(expected, diff_buf.ptr);
 
-	git_buf_free(&diff_buf);
+	git_buf_dispose(&diff_buf);
 	git_diff_free(diff);
 	git_tree_free(old_tree);
 	git_tree_free(new_tree);
diff --git a/tests/diff/stats.c b/tests/diff/stats.c
index 347d0d757..24316f715 100644
--- a/tests/diff/stats.c
+++ b/tests/diff/stats.c
@@ -54,11 +54,11 @@ void test_diff_stats__stat(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
 	cl_assert(strcmp(git_buf_cstr(&buf), stat) == 0);
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 80));
 	cl_assert(strcmp(git_buf_cstr(&buf), stat) == 0);
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__multiple_hunks(void)
@@ -78,7 +78,7 @@ void test_diff_stats__multiple_hunks(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__numstat(void)
@@ -93,7 +93,7 @@ void test_diff_stats__numstat(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_NUMBER, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__shortstat(void)
@@ -111,7 +111,7 @@ void test_diff_stats__shortstat(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_SHORT, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__shortstat_noinsertions(void)
@@ -129,7 +129,7 @@ void test_diff_stats__shortstat_noinsertions(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_SHORT, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__shortstat_nodeletions(void)
@@ -147,7 +147,7 @@ void test_diff_stats__shortstat_nodeletions(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_SHORT, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__rename(void)
@@ -167,7 +167,7 @@ void test_diff_stats__rename(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__rename_nochanges(void)
@@ -187,7 +187,7 @@ void test_diff_stats__rename_nochanges(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__rename_and_modifiy(void)
@@ -207,7 +207,7 @@ void test_diff_stats__rename_and_modifiy(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__rename_no_find(void)
@@ -229,7 +229,7 @@ void test_diff_stats__rename_no_find(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__rename_nochanges_no_find(void)
@@ -251,7 +251,7 @@ void test_diff_stats__rename_nochanges_no_find(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__rename_and_modify_no_find(void)
@@ -272,7 +272,7 @@ void test_diff_stats__rename_and_modify_no_find(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__binary(void)
@@ -292,7 +292,7 @@ void test_diff_stats__binary(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__binary_numstat(void)
@@ -306,7 +306,7 @@ void test_diff_stats__binary_numstat(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_NUMBER, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
 
 void test_diff_stats__mode_change(void)
@@ -322,5 +322,5 @@ void test_diff_stats__mode_change(void)
 
 	cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL | GIT_DIFF_STATS_INCLUDE_SUMMARY, 0));
 	cl_assert_equal_s(stat, git_buf_cstr(&buf));
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 }
diff --git a/tests/diff/submodules.c b/tests/diff/submodules.c
index eebfef3a2..8899d3f9c 100644
--- a/tests/diff/submodules.c
+++ b/tests/diff/submodules.c
@@ -50,7 +50,7 @@ static void check_diff_patches_at_line(
 		clar__assert_equal(
 			file, line, "expected diff did not match actual diff", 1,
 			"%s", expected[d], get_buf_ptr(&buf));
-		git_buf_free(&buf);
+		git_buf_dispose(&buf);
 	}
 
 	cl_assert_at_line(expected[d] && !strcmp(expected[d], "<END>"), file, line);
diff --git a/tests/diff/workdir.c b/tests/diff/workdir.c
index e1bbce8fb..d8270621f 100644
--- a/tests/diff/workdir.c
+++ b/tests/diff/workdir.c
@@ -1677,7 +1677,7 @@ void test_diff_workdir__patience_diff(void)
 	cl_assert_equal_s(expected_patience, buf.ptr);
 	git_buf_clear(&buf);
 
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 	git_patch_free(patch);
 	git_diff_free(diff);
 }
@@ -1807,7 +1807,7 @@ void test_diff_workdir__can_update_index(void)
 		git_buf path = GIT_BUF_INIT;
 		cl_git_pass(git_buf_sets(&path, "status"));
 		cl_git_pass(git_path_direach(&path, 0, touch_file, NULL));
-		git_buf_free(&path);
+		git_buf_dispose(&path);
 	}
 
 	opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;
@@ -1959,7 +1959,7 @@ void test_diff_workdir__binary_detection(void)
 	git_diff_free(diff);
 
 	git_index_free(idx);
-	git_buf_free(&b);
+	git_buf_dispose(&b);
 }
 
 void test_diff_workdir__to_index_conflicted(void) {
@@ -2050,7 +2050,7 @@ void test_diff_workdir__only_writes_index_when_necessary(void)
 	git_oid_cpy(&second, git_index_checksum(index));
 	cl_assert(!git_oid_equal(&first, &second));
 
-	git_buf_free(&path);
+	git_buf_dispose(&path);
 	git_object_free(head_object);
 	git_reference_free(head);
 	git_index_free(index);