diff options
author | Vicent Martà <vicent@github.com> | 2013-10-22 11:55:54 -0700 |
---|---|---|
committer | Vicent Martà <vicent@github.com> | 2013-10-22 11:55:54 -0700 |
commit | 1c74686e05c41c30944173bacec3a8312f08cbb5 (patch) | |
tree | 92f55460acf0944b00ff8d7a4500f10633351a4a /tests-clar/diff/pathspec.c | |
parent | 98fec8a937b93c6a6a0ad35ccd04af4cfeae1767 (diff) | |
parent | 7ce60099eec2442cc5428a830b88d51e8f9c1d75 (diff) | |
download | libgit2-1c74686e05c41c30944173bacec3a8312f08cbb5.tar.gz |
Merge pull request #1897 from libgit2/split-patch-from-diff
RFC: Proposed reworking of diff APIs
Diffstat (limited to 'tests-clar/diff/pathspec.c')
-rw-r--r-- | tests-clar/diff/pathspec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests-clar/diff/pathspec.c b/tests-clar/diff/pathspec.c index 7b15ea04c..5761d2d2b 100644 --- a/tests-clar/diff/pathspec.c +++ b/tests-clar/diff/pathspec.c @@ -20,7 +20,7 @@ void test_diff_pathspec__0(void) git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit); git_tree *b = resolve_commit_oid_to_tree(g_repo, b_commit); git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff_list *diff = NULL; + git_diff *diff = NULL; git_strarray paths = { NULL, 1 }; char *path; git_pathspec *ps; @@ -52,7 +52,7 @@ void test_diff_pathspec__0(void) (int)git_pathspec_match_list_diff_entry(matches,0)->status); git_pathspec_match_list_free(matches); - git_diff_list_free(diff); + git_diff_free(diff); diff = NULL; cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); @@ -68,7 +68,7 @@ void test_diff_pathspec__0(void) (int)git_pathspec_match_list_diff_entry(matches,0)->status); git_pathspec_match_list_free(matches); - git_diff_list_free(diff); + git_diff_free(diff); diff = NULL; cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts)); @@ -84,7 +84,7 @@ void test_diff_pathspec__0(void) (int)git_pathspec_match_list_diff_entry(matches,0)->status); git_pathspec_match_list_free(matches); - git_diff_list_free(diff); + git_diff_free(diff); diff = NULL; git_tree_free(a); |