From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 5/6] t/diff-lib: check exact object names in compare_diff_raw
Date: Sun, 15 Feb 2015 15:43:43 -0800 [thread overview]
Message-ID: <1424043824-25242-6-git-send-email-gitster@pobox.com> (raw)
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
next prev parent reply other threads:[~2015-02-15 23:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-15 23:43 [PATCH 0/6] test updates around diff Junio C Hamano
2015-02-15 23:43 ` [PATCH 1/6] t4008: correct stale comments Junio C Hamano
2015-02-15 23:43 ` [PATCH 2/6] t9300: correct expected object names Junio C Hamano
2015-02-15 23:43 ` [PATCH 3/6] t4010: " Junio C Hamano
2015-02-15 23:43 ` [PATCH 4/6] tests: do not borrow from COPYING and README from the real source Junio C Hamano
2015-02-15 23:43 ` Junio C Hamano [this message]
2015-02-23 18:14 ` [PATCH 5/6] t/diff-lib: check exact object names in compare_diff_raw Johannes Sixt
2015-02-23 19:45 ` Junio C Hamano
2015-02-15 23:43 ` [PATCH 6/6] t4008: modernise style Junio C Hamano
2015-02-16 6:23 ` [PATCH 0/6] test updates around diff Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424043824-25242-6-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).