@matheusbsbs / matheus-bagliano / commits / 2983c0e22a

test: use numstat instead of diffstat in binary-diff test

git's --stat output is intended for humans and since v1.7.9.2~13 (2012-02-01) varies by locale. The tests in this script using "apply --stat" are meant to check two things: - how binary file changes are accounted for and printed in git's diffstat format - that "git apply" can parse the various forms of binary diff Split these two kinds of check into separate tests, and use --numstat instead of --stat in the latter. This way, we lose less test coverage when git is being run without writing its output in the C locale (for example because GETTEXT_POISON is enabled) and there are fewer tests to change if the --stat output needs to be tweaked again. While at it, use commands separated by && that read and write to temporary files in place of pipelines so segfaults and other failures in the upstream of the processing pipeline don't get hidden. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jonathan Nieder committed Mar 13, 2012 at 00:02 UTC 2983c0e22a5b6a56b8f5d7bb2dd2a3a0e26ac005

1 file changed +23 -6

t/t4012-diff-binary.sh

+23 -6

@@ -8,6 +8,13 @@ test_description='Binary diff and apply

9 . ./test-lib.sh

11 +cat >expect.binary-numstat <<\EOF

12 +1 1 a

13 +- - b

14 +1 1 c

15 +- - d

16 +EOF

17 +

18 test_expect_success 'prepare repository' \

19 'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&

20 git update-index --add a b c d &&

@@ -23,13 +30,23 @@ cat > expected <<\EOF

30 d | Bin

31 4 files changed, 2 insertions(+), 2 deletions(-)

32 EOF

26 -test_expect_success 'diff without --binary' \

27 - 'git diff | git apply --stat --summary >current &&

28 - test_i18ncmp expected current'

33 +test_expect_success '"apply --stat" output for binary file change' '

34 + git diff >diff &&

35 + git apply --stat --summary <diff >current &&

36 + test_i18ncmp expected current

37 +'

30 -test_expect_success 'diff with --binary' \

31 - 'git diff --binary | git apply --stat --summary >current &&

32 - test_i18ncmp expected current'

39 +test_expect_success 'apply --numstat notices binary file change' '

40 + git diff >diff &&

41 + git apply --numstat <diff >current &&

42 + test_cmp expect.binary-numstat current

43 +'

44 +

45 +test_expect_success 'apply --numstat understands diff --binary format' '

46 + git diff --binary >diff &&

47 + git apply --numstat <diff >current &&

48 + test_cmp expect.binary-numstat current

49 +'

51 # apply needs to be able to skip the binary material correctly

52 # in order to report the line number of a corrupt patch.