diff options
author | Derrick Stolee <dstolee@microsoft.com> | 2021-11-19 09:13:49 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-11-22 14:53:23 -0800 |
commit | 33c5d6c8456ecb1e89450483586f5f3f115ffa93 (patch) | |
tree | 5706a3cdf0db7b5d86eb158b4b35a60792e306c8 /merge.c | |
parent | dir: fix directory-matching bug (diff) | |
download | tgif-33c5d6c8456ecb1e89450483586f5f3f115ffa93.tar.xz |
dir: revert "dir: select directories correctly"
This reverts commit f6526728f950cacfd5b5e42bcc65f2c47f3da654.
The change in f652672 (dir: select directories correctly, 2021-09-24)
caused a regression in directory-based matches with non-cone-mode
patterns, especially for .gitignore patterns. A test is included to
prevent this regression in the future.
The commit ed495847 (dir: fix pattern matching on dirs, 2021-09-24) was
reverted in 5ceb663 (dir: fix directory-matching bug, 2021-11-02) for
similar reasons. Neither commit changed tests, and tests added later in
the series continue to pass when these commits are reverted.
Reported-by: Danial Alihosseini <danial.alihosseini@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions