]> git.ipfire.org Git - thirdparty/git.git/commit
unpack-trees: fix nested sparse-dir search
authorDerrick Stolee <dstolee@microsoft.com>
Wed, 8 Sep 2021 01:42:27 +0000 (01:42 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2021 05:41:09 +0000 (22:41 -0700)
commit72d84ea347249c525712987b85ab16fdbb5e38c1
tree491de8389589c429858f264f1229b693984f8406
parente27eab45c758bf194157b819fae4fd0fcce498fb
unpack-trees: fix nested sparse-dir search

The iterated search in find_cache_entry() was recently modified to
include a loop that searches backwards for a sparse directory entry that
matches the given traverse_info and name_entry. However, the string
comparison failed to actually concatenate those two strings, so this
failed to find a sparse directory when it was not a top-level directory.

This caused some errors in rare cases where a 'git checkout' spanned a
diff that modified files within the sparse directory entry, but we could
not correctly find the entry.

Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Helped-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
unpack-trees.c