summaryrefslogtreecommitdiff
path: root/Documentation/git-blame.txt
diff options
context:
space:
mode:
authorLibravatar Derrick Stolee <dstolee@microsoft.com>2021-09-08 01:42:27 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-07 22:41:09 -0700
commit72d84ea347249c525712987b85ab16fdbb5e38c1 (patch)
tree491de8389589c429858f264f1229b693984f8406 /Documentation/git-blame.txt
parentsparse-index: silently return when not using cone-mode patterns (diff)
downloadtgif-72d84ea347249c525712987b85ab16fdbb5e38c1.tar.xz
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>
Diffstat (limited to 'Documentation/git-blame.txt')
0 files changed, 0 insertions, 0 deletions