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);
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);
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);
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);
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);
cl_assert_equal_s(expected, actual.ptr);
- git_buf_free(&actual);
+ git_buf_dispose(&actual);
git_patch_free(patch);
git_diff_free(diff);
}
{
git_diff *diff;
git_patch *patch;
- git_buf file = GIT_BUF_INIT, actual = GIT_BUF_INIT, expected = GIT_BUF_INIT;
+ git_str file = GIT_STR_INIT, expected = GIT_STR_INIT;
+ git_buf actual = GIT_BUF_INIT;
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
git_vector files = GIT_VECTOR_INIT;
size_t i;
g_repo = cl_git_sandbox_init("userdiff");
- cl_git_pass(git_path_dirload(&files, "userdiff/files", 9, 0));
+ cl_git_pass(git_fs_path_dirload(&files, "userdiff/files", 9, 0));
opts.interhunk_lines = 1;
opts.context_lines = 1;
cl_git_pass(git_patch_from_diff(&patch, diff, 0));
cl_git_pass(git_patch_to_buf(&actual, patch));
- git_buf_sets(&expected, "userdiff/expected/nodriver/diff.");
- git_buf_puts(&expected, extension);
+ git_str_sets(&expected, "userdiff/expected/nodriver/diff.");
+ git_str_puts(&expected, extension);
cl_git_pass(git_futils_readbuffer(&expected, expected.ptr));
overwrite_filemode(expected.ptr, &actual);
cl_assert_equal_s(expected.ptr, actual.ptr);
- git_buf_clear(&actual);
+ git_buf_dispose(&actual);
git_patch_free(patch);
git_diff_free(diff);
cl_git_pass(git_patch_from_diff(&patch, diff, 0));
cl_git_pass(git_patch_to_buf(&actual, patch));
- git_buf_sets(&expected, "userdiff/expected/driver/diff.");
- git_buf_puts(&expected, extension);
+ git_str_sets(&expected, "userdiff/expected/driver/diff.");
+ git_str_puts(&expected, extension);
cl_git_pass(git_futils_readbuffer(&expected, expected.ptr));
overwrite_filemode(expected.ptr, &actual);
cl_assert_equal_s(expected.ptr, actual.ptr);
- git_buf_clear(&actual);
+ git_buf_dispose(&actual);
git_patch_free(patch);
git_diff_free(diff);
git__free(path);
}
- git_buf_free(&file);
- git_buf_free(&actual);
- git_buf_free(&expected);
+ git_buf_dispose(&actual);
+ git_str_dispose(&file);
+ git_str_dispose(&expected);
git_vector_free(&files);
}