mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
3af828634f
As a general principle, we should not use "git diff" to validate the results of what git command that is being tested has done. We would not know if we are testing the command in question, or locating a bug in the cute hack of "git diff --no-index". Rather use test_cmp for that purpose. Signed-off-by: Junio C Hamano <gitster@pobox.com>
41 lines
1.4 KiB
Bash
41 lines
1.4 KiB
Bash
:
|
|
|
|
_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
|
|
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
|
|
sanitize_diff_raw='/^:/s/ '"$_x40"' '"$_x40"' \([A-Z]\)[0-9]* / X X \1# /'
|
|
compare_diff_raw () {
|
|
# When heuristics are improved, the score numbers would change.
|
|
# Ignore them while comparing.
|
|
# Also we do not check SHA1 hash generation in this test, which
|
|
# is a job for t0000-basic.sh
|
|
|
|
sed -e "$sanitize_diff_raw" <"$1" >.tmp-1
|
|
sed -e "$sanitize_diff_raw" <"$2" >.tmp-2
|
|
test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
|
|
}
|
|
|
|
sanitize_diff_raw_z='/^:/s/ '"$_x40"' '"$_x40"' \([A-Z]\)[0-9]*$/ X X \1#/'
|
|
compare_diff_raw_z () {
|
|
# When heuristics are improved, the score numbers would change.
|
|
# Ignore them while comparing.
|
|
# Also we do not check SHA1 hash generation in this test, which
|
|
# is a job for t0000-basic.sh
|
|
|
|
perl -pe 'y/\000/\012/' <"$1" | sed -e "$sanitize_diff_raw_z" >.tmp-1
|
|
perl -pe 'y/\000/\012/' <"$2" | sed -e "$sanitize_diff_raw_z" >.tmp-2
|
|
test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
|
|
}
|
|
|
|
compare_diff_patch () {
|
|
# When heuristics are improved, the score numbers would change.
|
|
# Ignore them while comparing.
|
|
sed -e '
|
|
/^[dis]*imilarity index [0-9]*%$/d
|
|
/^index [0-9a-f]*\.\.[0-9a-f]/d
|
|
' <"$1" >.tmp-1
|
|
sed -e '
|
|
/^[dis]*imilarity index [0-9]*%$/d
|
|
/^index [0-9a-f]*\.\.[0-9a-f]/d
|
|
' <"$2" >.tmp-2
|
|
test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
|
|
}
|