summaryrefslogtreecommitdiff
path: root/t/diff-lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-30 18:06:39 -0800
committerJunio C Hamano <junkio@cox.net>2005-10-30 18:06:39 -0800
commite634aec752642dcf86c3fc82025e43381d6768c2 (patch)
treea589b6756894d18c841ac61499e5d2c9beda36fd /t/diff-lib.sh
parenta1c7a69047e88244ed321b5aa2a8bcbba5a869c2 (diff)
parent80e0c0ab91e1cf6a6315d0431bf6873ebbf8bef0 (diff)
GIT 0.99.9av0.99.9a
... to contain the RPM workaround. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/diff-lib.sh')
-rwxr-xr-xt/diff-lib.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/t/diff-lib.sh b/t/diff-lib.sh
index a912f435aa..745a1b0311 100755
--- a/t/diff-lib.sh
+++ b/t/diff-lib.sh
@@ -29,7 +29,13 @@ compare_diff_raw_z () {
compare_diff_patch () {
# When heuristics are improved, the score numbers would change.
# Ignore them while comparing.
- sed -e '/^[dis]*imilarity index [0-9]*%$/d' <"$1" >.tmp-1
- sed -e '/^[dis]*imilarity index [0-9]*%$/d' <"$2" >.tmp-2
+ 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
diff -u .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
}