diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-05-25 20:03:59 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-06-12 09:39:20 -0400 |
| commit | 8147b1aff56c0f36f6afee9b8810fc74776e1f58 (patch) | |
| tree | 298396fb80a973b990e21084e29b0466ceafe5ed /tests/diff/submodules.c | |
| parent | ac7012a81f0bdc472a3d22393291eb7d130705d1 (diff) | |
| download | libgit2-8147b1aff56c0f36f6afee9b8810fc74776e1f58.tar.gz | |
diff: introduce binary diff callbacks
Introduce a new binary diff callback to provide the actual binary
delta contents to callers. Create this data from the diff contents
(instead of directly from the ODB) to support binary diffs including
the workdir, not just things coming out of the ODB.
Diffstat (limited to 'tests/diff/submodules.c')
| -rw-r--r-- | tests/diff/submodules.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/diff/submodules.c b/tests/diff/submodules.c index 02870ac86..e2169583b 100644 --- a/tests/diff/submodules.c +++ b/tests/diff/submodules.c @@ -465,7 +465,7 @@ void test_diff_submodules__skips_empty_includes_used(void) cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); + diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(0, exp.files); git_diff_free(diff); @@ -478,7 +478,7 @@ void test_diff_submodules__skips_empty_includes_used(void) cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); + diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); git_diff_free(diff); @@ -488,7 +488,7 @@ void test_diff_submodules__skips_empty_includes_used(void) cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); + diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); git_diff_free(diff); |