diff options
| author | Russell Belfer <rb@github.com> | 2013-10-15 15:10:07 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-10-15 15:10:07 -0700 |
| commit | 10672e3e455eba2d4ca983070ed427caeeb24a6f (patch) | |
| tree | e812af06091362849e9ecd279c5547e401cb0862 /tests-clar/diff/rename.c | |
| parent | 3ff1d123736e5686fb9ec16e65828d5b8ffa2b30 (diff) | |
| download | libgit2-10672e3e455eba2d4ca983070ed427caeeb24a6f.tar.gz | |
Diff API cleanup
This lays groundwork for separating formatting options from diff
creation options. This groups the formatting flags separately
from the diff list creation flags and reorders the options. This
also tweaks some APIs to further separate code that uses patches
from code that just looks at git_diffs.
Diffstat (limited to 'tests-clar/diff/rename.c')
| -rw-r--r-- | tests-clar/diff/rename.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests-clar/diff/rename.c b/tests-clar/diff/rename.c index 45706fb47..42bb65aa8 100644 --- a/tests-clar/diff/rename.c +++ b/tests-clar/diff/rename.c @@ -584,7 +584,8 @@ void test_diff_rename__patch(void) cl_assert_equal_i(4, (int)git_diff_num_deltas(diff)); - cl_git_pass(git_patch_from_diff(&patch, &delta, diff, 0)); + cl_git_pass(git_patch_from_diff(&patch, diff, 0)); + cl_assert((delta = git_patch_get_delta(patch)) != NULL); cl_assert_equal_i(GIT_DELTA_COPIED, (int)delta->status); cl_git_pass(git_patch_to_str(&text, patch)); @@ -593,13 +594,13 @@ void test_diff_rename__patch(void) git_patch_free(patch); - cl_git_pass(git_patch_from_diff(NULL, &delta, diff, 1)); + cl_assert((delta = git_diff_get_delta(diff, 1)) != NULL); cl_assert_equal_i(GIT_DELTA_UNMODIFIED, (int)delta->status); - cl_git_pass(git_patch_from_diff(NULL, &delta, diff, 2)); + cl_assert((delta = git_diff_get_delta(diff, 2)) != NULL); cl_assert_equal_i(GIT_DELTA_MODIFIED, (int)delta->status); - cl_git_pass(git_patch_from_diff(NULL, &delta, diff, 3)); + cl_assert((delta = git_diff_get_delta(diff, 3)) != NULL); cl_assert_equal_i(GIT_DELTA_MODIFIED, (int)delta->status); git_diff_free(diff); |