diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2014-09-12 21:47:34 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-09-12 14:21:16 -0700 |
| commit | f9f3851b4d2cb17bb4ec2d2b00514b1b2d5df456 (patch) | |
| tree | 5f83de617da7822b43a391c0a552fa43e8d8895d | |
| parent | Merge git://github.com/git-l10n/git-po (diff) | |
| download | tgif-f9f3851b4d2cb17bb4ec2d2b00514b1b2d5df456.tar.xz | |
t9300: use test_cmp_bin instead of test_cmp to compare binary files
test_cmp is intended to produce diff output for human consumption. The
input in one instance in t9300-fast-import.sh are binary files, however.
Use test_cmp_bin to compare the files.
This was noticed because on Windows we have a special implementation of
test_cmp in pure bash code (to ignore differences due to intermittent CR
in actual output), and bash runs into an infinite loop due to the binary
nature of the input.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t9300-fast-import.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 5fc9ef262a..91c5239762 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2687,7 +2687,7 @@ test_expect_success 'R: verify created pack' ' test_expect_success \ 'R: verify written objects' \ 'git --git-dir=R/.git cat-file blob big-file:big1 >actual && - test_cmp expect actual && + test_cmp_bin expect actual && a=$(git --git-dir=R/.git rev-parse big-file:big1) && b=$(git --git-dir=R/.git rev-parse big-file:big2) && test $a = $b' |