Commit d3dd775e by Russell Belfer

Merge pull request #608 from schu/remove-unused-parameter

diff_output: remove unused parameter
parents e71b78b0 7826d577
...@@ -340,7 +340,6 @@ GIT_EXTERN(int) git_diff_print_patch( ...@@ -340,7 +340,6 @@ GIT_EXTERN(int) git_diff_print_patch(
* Directly run a text diff on two blobs. * Directly run a text diff on two blobs.
*/ */
GIT_EXTERN(int) git_diff_blobs( GIT_EXTERN(int) git_diff_blobs(
git_repository *repo,
git_blob *old_blob, git_blob *old_blob,
git_blob *new_blob, git_blob *new_blob,
git_diff_options *options, git_diff_options *options,
......
...@@ -671,7 +671,6 @@ int git_diff_print_patch( ...@@ -671,7 +671,6 @@ int git_diff_print_patch(
int git_diff_blobs( int git_diff_blobs(
git_repository *repo,
git_blob *old_blob, git_blob *old_blob,
git_blob *new_blob, git_blob *new_blob,
git_diff_options *options, git_diff_options *options,
...@@ -686,8 +685,6 @@ int git_diff_blobs( ...@@ -686,8 +685,6 @@ int git_diff_blobs(
xdemitconf_t xdiff_config; xdemitconf_t xdiff_config;
xdemitcb_t xdiff_callback; xdemitcb_t xdiff_callback;
assert(repo);
if (options && (options->flags & GIT_DIFF_REVERSE)) { if (options && (options->flags & GIT_DIFF_REVERSE)) {
git_blob *swap = old_blob; git_blob *swap = old_blob;
old_blob = new_blob; old_blob = new_blob;
......
...@@ -43,7 +43,7 @@ void test_diff_blob__0(void) ...@@ -43,7 +43,7 @@ void test_diff_blob__0(void)
memset(&exp, 0, sizeof(exp)); memset(&exp, 0, sizeof(exp));
cl_git_pass(git_diff_blobs( cl_git_pass(git_diff_blobs(
g_repo, a, b, &opts, &exp, diff_hunk_fn, diff_line_fn)); a, b, &opts, &exp, diff_hunk_fn, diff_line_fn));
cl_assert(exp.hunks == 1); cl_assert(exp.hunks == 1);
cl_assert(exp.lines == 6); cl_assert(exp.lines == 6);
...@@ -53,7 +53,7 @@ void test_diff_blob__0(void) ...@@ -53,7 +53,7 @@ void test_diff_blob__0(void)
memset(&exp, 0, sizeof(exp)); memset(&exp, 0, sizeof(exp));
cl_git_pass(git_diff_blobs( cl_git_pass(git_diff_blobs(
g_repo, b, c, &opts, &exp, diff_hunk_fn, diff_line_fn)); b, c, &opts, &exp, diff_hunk_fn, diff_line_fn));
cl_assert(exp.hunks == 1); cl_assert(exp.hunks == 1);
cl_assert(exp.lines == 15); cl_assert(exp.lines == 15);
...@@ -63,7 +63,7 @@ void test_diff_blob__0(void) ...@@ -63,7 +63,7 @@ void test_diff_blob__0(void)
memset(&exp, 0, sizeof(exp)); memset(&exp, 0, sizeof(exp));
cl_git_pass(git_diff_blobs( cl_git_pass(git_diff_blobs(
g_repo, a, c, &opts, &exp, diff_hunk_fn, diff_line_fn)); a, c, &opts, &exp, diff_hunk_fn, diff_line_fn));
cl_assert(exp.hunks == 1); cl_assert(exp.hunks == 1);
cl_assert(exp.lines == 13); cl_assert(exp.lines == 13);
...@@ -75,7 +75,7 @@ void test_diff_blob__0(void) ...@@ -75,7 +75,7 @@ void test_diff_blob__0(void)
memset(&exp, 0, sizeof(exp)); memset(&exp, 0, sizeof(exp));
cl_git_pass(git_diff_blobs( cl_git_pass(git_diff_blobs(
g_repo, c, d, &opts, &exp, diff_hunk_fn, diff_line_fn)); c, d, &opts, &exp, diff_hunk_fn, diff_line_fn));
cl_assert(exp.hunks == 2); cl_assert(exp.hunks == 2);
cl_assert(exp.lines == 14); cl_assert(exp.lines == 14);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment