[PATCH 5/6] t/diff-lib: check exact object names in compare_diff_raw

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 15, 2015, 23:43 UTC
Message-ID: <1424043824-25242-6-git-send-email-gitster@pobox.com>
In-Reply-To: <1424043824-25242-1-git-send-email-gitster@pobox.com>

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>
---
 t/diff-lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/diff-lib.sh b/t/diff-lib.sh
index 75a35fc..c211dc4 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.

-- 
2.3.0-266-g5b48884