diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-31 21:47:25 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-31 23:17:27 (GMT) |
| commit | edb0c724287a0ee7cefa11f28ef43d8c5cfa1985 (patch) | |
| tree | a57cf3c72cf79ee8fea2f9aeae921d8bcc9fd34e /t/t4005-diff-rename-2.sh | |
| parent | 1d9e6f92bc6a1a1a37d187db72dcc02642ba04f6 (diff) | |
| download | git-edb0c724287a0ee7cefa11f28ef43d8c5cfa1985.zip git-edb0c724287a0ee7cefa11f28ef43d8c5cfa1985.tar.gz git-edb0c724287a0ee7cefa11f28ef43d8c5cfa1985.tar.bz2 | |
[PATCH] diff: consolidate test helper script pieces.
There were duplicate script pieces to help comparing diff
output, which this patch consolidates into the t/diff-lib.sh
library.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 't/t4005-diff-rename-2.sh')
| -rw-r--r-- | t/t4005-diff-rename-2.sh | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh index 5ac29d1..fa2b155 100644 --- a/t/t4005-diff-rename-2.sh +++ b/t/t4005-diff-rename-2.sh @@ -7,28 +7,7 @@ test_description='Same rename detection as t4003 but testing diff-raw. ' . ./test-lib.sh - -_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 - diff -u .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 '/^similarity index [0-9]*%$/d' <"$1" >.tmp-1 - sed -e '/^similarity index [0-9]*%$/d' <"$2" >.tmp-2 - diff -u .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2 -} +. ../diff-lib.sh ;# test-lib chdir's into trash test_expect_success \ 'prepare reference tree' \ |