summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-15 13:47:36 -0800
committerJunio C Hamano <gitster@pobox.com>2015-02-15 15:38:16 -0800
commitbd9150b7e5f34d7148b02ca2eed96270c7744049 (patch)
treee9b3870a6d10befcfe4b106bf6c349703fe2f38a
parent459b8d22e544b3876a2270ee7290c289a39ebbb2 (diff)
downloadgit-bd9150b7e5f34d7148b02ca2eed96270c7744049.tar.gz
t/diff-lib: check exact object names in compare_diff_raw
The "sanitize" helper wanted to strip the similarity and dissimilarity scores when making comparison, but it was stripping away the object names as well. While we do not want to require the exact object names the tests expect to be maintained, as it would be seen as an extra burden, this would have prevented us catching a silly bug such as showing non 0{40} object name on the preimage side of an addition or on the postimage side of a deletion, because all [0-9a-f]{40} strings were considered equally OK. In the longer term, when a test only wants to see the status of the change without having to worry about object names, it should be rewritten not to inspect the raw format. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/diff-lib.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/diff-lib.sh b/t/diff-lib.sh
index 75a35fcd06..c211dc40ee 100644
--- a/t/diff-lib.sh
+++ b/t/diff-lib.sh
@@ -1,6 +1,6 @@
:
-sanitize_diff_raw='/^:/s/ '"$_x40"' '"$_x40"' \([A-Z]\)[0-9]* / X X \1# /'
+sanitize_diff_raw='/^:/s/ '"\($_x40\)"' '"\($_x40\)"' \([A-Z]\)[0-9]* / \1 \2 \3# /'
compare_diff_raw () {
# When heuristics are improved, the score numbers would change.
# Ignore them while comparing.