Skip to content

Commit

Permalink
t/diff-lib: check exact object names in compare_diff_raw
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Feb 15, 2015
1 parent 459b8d2 commit bd9150b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion t/diff-lib.sh
Original file line number Diff line number Diff line change
@@ -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.
Expand Down

0 comments on commit bd9150b

Please sign in to comment.