mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
5bd74506cd
Now that "git diff" handles stdin and relative paths outside the working tree correctly, we can convert all instances of "diff -u" to "git diff". This commit is really the result of $ perl -pi.bak -e 's/diff -u/git diff/' $(git grep -l "diff -u" t/) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from commit c699a40d68215c7e44a5b26117a35c8a56fbd387)
42 lines
1.4 KiB
Bash
Executable file
42 lines
1.4 KiB
Bash
Executable file
:
|
|
|
|
_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
|
|
git diff .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
|
|
|
|
tr '\0' '\012' <"$1" | sed -e "$sanitize_diff_raw_z" >.tmp-1
|
|
tr '\0' '\012' <"$2" | sed -e "$sanitize_diff_raw_z" >.tmp-2
|
|
git diff .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
|
|
git diff .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
|
|
}
|