mirror of
https://github.com/git/git
synced 2024-08-24 10:15:51 +00:00
![Jeff King](/assets/img/avatar_default.png)
Many scripts compare actual and expected output using "diff -u". This is nicer than "cmp" because the output shows how the two differ. However, not all versions of diff understand -u, leading to unnecessary test failure. This adds a test_cmp function to the test scripts and switches all "diff -u" invocations to use it. The function uses the contents of "$GIT_TEST_CMP" to compare its arguments; the default is "diff -u". On systems with a less-capable diff, you can do: GIT_TEST_CMP=cmp make test Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
45 lines
665 B
Bash
Executable file
45 lines
665 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='diff hunk header truncation'
|
|
|
|
. ./test-lib.sh
|
|
|
|
N='日本語'
|
|
N1='日'
|
|
N2='日本'
|
|
NS="$N$N$N$N$N$N$N$N$N$N$N$N$N"
|
|
|
|
test_expect_success setup '
|
|
|
|
(
|
|
echo "A $NS"
|
|
for c in B C D E F G H I J K
|
|
do
|
|
echo " $c"
|
|
done
|
|
echo "L $NS"
|
|
for c in M N O P Q R S T U V
|
|
do
|
|
echo " $c"
|
|
done
|
|
) >file &&
|
|
git add file &&
|
|
|
|
sed -e "/^ [EP]/s/$/ modified/" <file >file+ &&
|
|
mv file+ file
|
|
|
|
'
|
|
|
|
test_expect_success 'hunk header truncation with an overly long line' '
|
|
|
|
git diff | sed -n -e "s/^.*@@//p" >actual &&
|
|
(
|
|
echo " A $N$N$N$N$N$N$N$N$N2"
|
|
echo " L $N$N$N$N$N$N$N$N$N1"
|
|
) >expected &&
|
|
test_cmp actual expected
|
|
|
|
'
|
|
|
|
test_done
|