diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2020-10-04 21:41:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-04 21:41:28 +0100 |
| commit | 9293e165a0214a277af306fcca640c2d637f2792 (patch) | |
| tree | e764e2d35b1a3473f729696c914e57793fc97237 /tests/diff | |
| parent | e8ab3db99e13bcb330e91e0ca0265b60483a5e47 (diff) | |
| parent | e72ade87fdb3acf3cbb6bf6d52cd774d924e0e2c (diff) | |
| download | libgit2-9293e165a0214a277af306fcca640c2d637f2792.tar.gz | |
Merge pull request #5494 from kevinjswinton/master
Fix binary diff showing /dev/null
Diffstat (limited to 'tests/diff')
| -rw-r--r-- | tests/diff/format_email.c | 3 | ||||
| -rw-r--r-- | tests/diff/stats.c | 3 |
2 files changed, 2 insertions, 4 deletions
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 520a859fc..54572672c 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); |