summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-12-15 22:02:45 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-03 14:08:30 -0800
commit86e4ca69e358836599d4eb0c0e217caa9c9e455b (patch)
tree1b9f49279e2f071bb12b1777481826de1d139908 /t/t3030-merge-recursive.sh
parenttree_entry_interesting(): support depth limit (diff)
downloadtgif-86e4ca69e358836599d4eb0c0e217caa9c9e455b.tar.xz
tree_entry_interesting(): fix depth limit with overlapping pathspecs
Suppose we have two pathspecs 'a' and 'a/b' (both are dirs) and depth limit 1. In current code, pathspecs are checked in input order. When 'a/b' is checked against pathspec 'a', it fails depth limit and therefore is excluded, although it should match 'a/b' pathspec. This patch reorders all pathspecs alphabetically, then teaches tree_entry_interesting() to check against the deepest pathspec first, so depth limit of a shallower pathspec won't affect a deeper one. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions