aab3b9a1aa
"git read-tree A B C..." without the "-m" (merge) option is a way to read these trees on top of each other to get an overlay of them. An ancient commitee6566e(Rewrite read-tree, 2005-09-05) passed the ADD_CACHE_SKIP_DFCHECK flag when calling add_index_entry() to add the paths obtained from these trees to the index, but it is an incorrect use of the flag. The flag is meant to be used by callers who know the addition of the entry does not introduce a D/F conflict to the index in order to avoid the overhead of checking. This bug resulted in a bogus index that records both "x" and "x/z" as a blob after reading three trees that have paths ("x"), ("x", "y"), and ("x/z", "y") respectively.34110cd(Make 'unpack_trees()' have a separate source and destination index, 2008-03-06) refactored the callsites of add_index_entry() incorrectly and added more codepaths that use this flag when it shouldn't be used. Also,0190457(Move 'unpack_trees()' over to 'traverse_trees()' interface, 2008-03-05) introduced a bug to call add_index_entry() for the tree that does not have the path in it, passing NULL as a cache entry. This caused reading multiple trees, one of which has path "x" but another doesn't, to segfault. Signed-off-by: Junio C Hamano <gitster@pobox.com>
32 lines
538 B
Bash
Executable File
32 lines
538 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test multi-tree read-tree without merging'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
echo one >a &&
|
|
git add a &&
|
|
git commit -m initial &&
|
|
git tag initial &&
|
|
echo two >b &&
|
|
git add b &&
|
|
git commit -m second &&
|
|
git checkout -b side initial &&
|
|
echo three >a &&
|
|
mkdir b &&
|
|
echo four >b/c &&
|
|
git add b/c &&
|
|
git commit -m third
|
|
'
|
|
|
|
test_expect_success 'multi-read' '
|
|
git read-tree initial master side &&
|
|
(echo a; echo b/c) >expect &&
|
|
git ls-files >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|
|
|