mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
2983c0e22a
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>
110 lines
2.9 KiB
Bash
Executable file
110 lines
2.9 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Junio C Hamano
|
|
#
|
|
|
|
test_description='Binary diff and apply
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
cat >expect.binary-numstat <<\EOF
|
|
1 1 a
|
|
- - b
|
|
1 1 c
|
|
- - d
|
|
EOF
|
|
|
|
test_expect_success 'prepare repository' \
|
|
'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
|
|
git update-index --add a b c d &&
|
|
echo git >a &&
|
|
cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
|
|
echo git >c &&
|
|
cat b b >d'
|
|
|
|
cat > expected <<\EOF
|
|
a | 2 +-
|
|
b | Bin
|
|
c | 2 +-
|
|
d | Bin
|
|
4 files changed, 2 insertions(+), 2 deletions(-)
|
|
EOF
|
|
test_expect_success '"apply --stat" output for binary file change' '
|
|
git diff >diff &&
|
|
git apply --stat --summary <diff >current &&
|
|
test_i18ncmp expected current
|
|
'
|
|
|
|
test_expect_success 'apply --numstat notices binary file change' '
|
|
git diff >diff &&
|
|
git apply --numstat <diff >current &&
|
|
test_cmp expect.binary-numstat current
|
|
'
|
|
|
|
test_expect_success 'apply --numstat understands diff --binary format' '
|
|
git diff --binary >diff &&
|
|
git apply --numstat <diff >current &&
|
|
test_cmp expect.binary-numstat current
|
|
'
|
|
|
|
# apply needs to be able to skip the binary material correctly
|
|
# in order to report the line number of a corrupt patch.
|
|
test_expect_success 'apply detecting corrupt patch correctly' \
|
|
'git diff | sed -e 's/-CIT/xCIT/' >broken &&
|
|
if git apply --stat --summary broken 2>detected
|
|
then
|
|
echo unhappy - should have detected an error
|
|
(exit 1)
|
|
else
|
|
echo happy
|
|
fi &&
|
|
detected=`cat detected` &&
|
|
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
|
|
detected=`sed -ne "${detected}p" broken` &&
|
|
test "$detected" = xCIT'
|
|
|
|
test_expect_success 'apply detecting corrupt patch correctly' \
|
|
'git diff --binary | sed -e 's/-CIT/xCIT/' >broken &&
|
|
if git apply --stat --summary broken 2>detected
|
|
then
|
|
echo unhappy - should have detected an error
|
|
(exit 1)
|
|
else
|
|
echo happy
|
|
fi &&
|
|
detected=`cat detected` &&
|
|
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
|
|
detected=`sed -ne "${detected}p" broken` &&
|
|
test "$detected" = xCIT'
|
|
|
|
test_expect_success 'initial commit' 'git commit -a -m initial'
|
|
|
|
# Try removal (b), modification (d), and creation (e).
|
|
test_expect_success 'diff-index with --binary' \
|
|
'echo AIT >a && mv b e && echo CIT >c && cat e >d &&
|
|
git update-index --add --remove a b c d e &&
|
|
tree0=`git write-tree` &&
|
|
git diff --cached --binary >current &&
|
|
git apply --stat --summary current'
|
|
|
|
test_expect_success 'apply binary patch' \
|
|
'git reset --hard &&
|
|
git apply --binary --index <current &&
|
|
tree1=`git write-tree` &&
|
|
test "$tree1" = "$tree0"'
|
|
|
|
test_expect_success 'diff --no-index with binary creation' '
|
|
echo Q | q_to_nul >binary &&
|
|
(: hide error code from diff, which just indicates differences
|
|
git diff --binary --no-index /dev/null binary >current ||
|
|
true
|
|
) &&
|
|
rm binary &&
|
|
git apply --binary <current &&
|
|
echo Q >expected &&
|
|
nul_to_q <binary >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|