5c72261c66
Commit4d6be03b95("diffcore-rename: avoid processing duplicate destinations", 2015-02-26) added t4058 to demonstrate that a workaround it added to avoid double frees (namely to just turn off rename detection when trees had duplicate entries) would indeed avoid segfaults. The tests, though, give the impression that the expected diffs are "correct" when in reality they are just "don't segfault, and do something semi-reasonable under the circumstances". Add some notes to make this clearer. Also, commit25d5ea410f("[PATCH] Redo rename/copy detection logic.", 2005-05-24) added a similar workaround to avoid segfaults, but for rename_src rather than rename_dst. I do not see any tests in the testsuite to cover the collision detection of entries limited to the source side, so add a couple. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
123 lines
4.0 KiB
Bash
Executable File
123 lines
4.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
# NOTICE:
|
|
# This testsuite does a number of diffs and checks that the output match.
|
|
# However, it is a "garbage in, garbage out" situation; the trees have
|
|
# duplicate entries for individual paths, and it results in diffs that do
|
|
# not make much sense. As such, it is not clear that the diffs are
|
|
# "correct". The primary purpose of these tests was to verify that
|
|
# diff-tree does not segfault, but there is perhaps some value in ensuring
|
|
# that the diff output isn't wildly unreasonable.
|
|
|
|
test_description='test tree diff when trees have duplicate entries'
|
|
. ./test-lib.sh
|
|
|
|
# make_tree_entry <mode> <mode> <sha1>
|
|
#
|
|
# We have to rely on perl here because not all printfs understand
|
|
# hex escapes (only octal), and xxd is not portable.
|
|
make_tree_entry () {
|
|
printf '%s %s\0' "$1" "$2" &&
|
|
perl -e 'print chr(hex($_)) for ($ARGV[0] =~ /../g)' "$3"
|
|
}
|
|
|
|
# Like git-mktree, but without all of the pesky sanity checking.
|
|
# Arguments come in groups of three, each group specifying a single
|
|
# tree entry (see make_tree_entry above).
|
|
make_tree () {
|
|
while test $# -gt 2; do
|
|
make_tree_entry "$1" "$2" "$3"
|
|
shift; shift; shift
|
|
done |
|
|
git hash-object -w -t tree --stdin
|
|
}
|
|
|
|
# this is kind of a convoluted setup, but matches
|
|
# a real-world case. Each tree contains four entries
|
|
# for the given path, one with one sha1, and three with
|
|
# the other. The first tree has them split across
|
|
# two subtrees (which are themselves duplicate entries in
|
|
# the root tree), and the second has them all in a single subtree.
|
|
test_expect_success 'create trees with duplicate entries' '
|
|
blob_one=$(echo one | git hash-object -w --stdin) &&
|
|
blob_two=$(echo two | git hash-object -w --stdin) &&
|
|
inner_one_a=$(make_tree \
|
|
100644 inner $blob_one
|
|
) &&
|
|
inner_one_b=$(make_tree \
|
|
100644 inner $blob_two \
|
|
100644 inner $blob_two \
|
|
100644 inner $blob_two
|
|
) &&
|
|
outer_one=$(make_tree \
|
|
040000 outer $inner_one_a \
|
|
040000 outer $inner_one_b
|
|
) &&
|
|
inner_two=$(make_tree \
|
|
100644 inner $blob_one \
|
|
100644 inner $blob_two \
|
|
100644 inner $blob_two \
|
|
100644 inner $blob_two
|
|
) &&
|
|
outer_two=$(make_tree \
|
|
040000 outer $inner_two
|
|
) &&
|
|
git tag one $outer_one &&
|
|
git tag two $outer_two
|
|
'
|
|
|
|
test_expect_success 'create tree without duplicate entries' '
|
|
blob_one=$(echo one | git hash-object -w --stdin) &&
|
|
outer_three=$(make_tree \
|
|
100644 renamed $blob_one
|
|
) &&
|
|
git tag three $outer_three
|
|
'
|
|
|
|
test_expect_success 'diff-tree between duplicate trees' '
|
|
# See NOTICE at top of file
|
|
{
|
|
printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
|
|
printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
|
|
printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
|
|
printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
|
|
printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
|
|
printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n"
|
|
} >expect &&
|
|
git diff-tree -r --no-abbrev one two >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'diff-tree with renames' '
|
|
# See NOTICE at top of file.
|
|
git diff-tree -M -r --no-abbrev one two >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'diff-tree FROM duplicate tree' '
|
|
# See NOTICE at top of file.
|
|
{
|
|
printf ":100644 000000 $blob_one $ZERO_OID D\touter/inner\n" &&
|
|
printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
|
|
printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
|
|
printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
|
|
printf ":000000 100644 $ZERO_OID $blob_one A\trenamed\n"
|
|
} >expect &&
|
|
git diff-tree -r --no-abbrev one three >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'diff-tree FROM duplicate tree, with renames' '
|
|
# See NOTICE at top of file.
|
|
{
|
|
printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
|
|
printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
|
|
printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
|
|
printf ":100644 100644 $blob_one $blob_one R100\touter/inner\trenamed\n"
|
|
} >expect &&
|
|
git diff-tree -M -r --no-abbrev one three >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|