summaryrefslogtreecommitdiffstats
path: root/parse-options-cb.c
diff options
context:
space:
mode:
authorVictoria Dye <vdye@github.com>2022-09-01 23:02:33 +0200
committerJunio C Hamano <gitster@pobox.com>2022-09-02 18:43:09 +0200
commit037f8ea6d961a52deaa8df5150049850a53d61ac (patch)
treebd9665165c48c92cd903b0e22d11fbfadd93b950 /parse-options-cb.c
parentunpack-trees: unpack new trees as sparse directories (diff)
downloadgit-037f8ea6d961a52deaa8df5150049850a53d61ac.tar.xz
git-037f8ea6d961a52deaa8df5150049850a53d61ac.zip
unpack-trees: fix sparse directory recursion check
Ensure 'is_sparse_directory_entry()' receives a valid 'name_entry *' if one exists in the list of tree(s) being unpacked in 'unpack_callback()'. Currently, 'is_sparse_directory_entry()' is called with the first 'name_entry' in the 'names' list of entries on 'unpack_callback()'. However, this entry may be empty even when other elements of 'names' are not (such as when switching from an orphan branch back to a "normal" branch). As a result, 'is_sparse_directory_entry()' could incorrectly indicate that a sparse directory is *not* actually sparse because the name of the index entry does not match the (empty) 'name_entry' path. Fix the issue by using the existing 'name_entry *p' value in 'unpack_callback()', which points to the first non-empty entry in 'names'. Because 'p' is 'const', also update 'is_sparse_directory_entry()'s 'name_entry *' argument to be 'const'. Finally, add a regression test case. Reported-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options-cb.c')
0 files changed, 0 insertions, 0 deletions