diff options
| author | Kevin Swinton <kevin.swinton@gmail.com> | 2020-04-18 11:32:56 +0100 |
|---|---|---|
| committer | Kevin Swinton <kevin.swinton@gmail.com> | 2020-04-18 11:32:56 +0100 |
| commit | e72ade87fdb3acf3cbb6bf6d52cd774d924e0e2c (patch) | |
| tree | f78524e116f005e04014f12cc732f88d2103adf8 | |
| parent | 918a7d19553a9a4181bf1561b8b828a5f82e60e0 (diff) | |
| download | libgit2-e72ade87fdb3acf3cbb6bf6d52cd774d924e0e2c.tar.gz | |
Fix binary diff showing /dev/null
Fixes issue where a changed binary file's content in the working
tree isn't displayed correctly, instead showing an oid of zero,
and with its path being reported incorrectly as "/dev/null".
| -rw-r--r-- | src/patch_generate.c | 4 | ||||
| -rw-r--r-- | tests/diff/format_email.c | 3 | ||||
| -rw-r--r-- | tests/diff/stats.c | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/patch_generate.c b/src/patch_generate.c index 18256d076..6dd61c18f 100644 --- a/src/patch_generate.c +++ b/src/patch_generate.c @@ -209,9 +209,7 @@ static int patch_generated_load(git_patch_generated *patch, git_patch_generated_ if ((error = git_diff_file_content__load( &patch->ofile, &patch->base.diff_opts)) < 0 || - should_skip_binary(patch, patch->ofile.file)) - goto cleanup; - if ((error = git_diff_file_content__load( + (error = git_diff_file_content__load( &patch->nfile, &patch->base.diff_opts)) < 0 || should_skip_binary(patch, patch->nfile.file)) goto cleanup; diff --git a/tests/diff/format_email.c b/tests/diff/format_email.c index 28f840ab0..bdfc4cac3 100644 --- a/tests/diff/format_email.c +++ b/tests/diff/format_email.c @@ -487,7 +487,7 @@ void test_diff_format_email__binary(void) "Subject: [PATCH] Modified binary file\n" \ "\n" \ "---\n" \ - " binary.bin | Bin 3 -> 0 bytes\n" \ + " binary.bin | Bin 3 -> 5 bytes\n" \ " 1 file changed, 0 insertions(+), 0 deletions(-)\n" \ "\n" \ "diff --git a/binary.bin b/binary.bin\n" \ @@ -496,7 +496,6 @@ void test_diff_format_email__binary(void) "--\n" \ "libgit2 " LIBGIT2_VERSION "\n" \ "\n"; - /* TODO: Actually 0 bytes here should be 5!. Seems like we don't load the new content for binary files? */ opts.summary = "Modified binary file"; diff --git a/tests/diff/stats.c b/tests/diff/stats.c index 150355686..8bd72633c 100644 --- a/tests/diff/stats.c +++ b/tests/diff/stats.c @@ -298,9 +298,8 @@ void test_diff_stats__binary(void) { git_buf buf = GIT_BUF_INIT; const char *stat = - " binary.bin | Bin 3 -> 0 bytes\n" + " binary.bin | Bin 3 -> 5 bytes\n" " 1 file changed, 0 insertions(+), 0 deletions(-)\n"; - /* TODO: Actually 0 bytes here should be 5!. Seems like we don't load the new content for binary files? */ diff_stats_from_commit_oid( &_stats, "8d7523f6fcb2404257889abe0d96f093d9f524f9", false); |