@matheusbsbs / matheus-bagliano / commits / 4838237cb7

diff-index: enable recursive pathspec matching in unpack_trees

The pathspec structure has a few bits of data to drive various operation modes after we unified the pathspec matching logic in various codepaths. For example, max_depth field is there so that "git grep" can limit the output for files found in limited depth of tree traversal. Also in order to show just the surface level differences in "git diff-tree", recursive field stops us from descending into deeper level of the tree structure when it is set to false, and this also affects pathspec matching when we have wildcards in the pathspec. The diff-index has always wanted the recursive behaviour, and wanted to match pathspecs without any depth limit. But we forgot to do so when we updated tree_entry_interesting() logic to unify the pathspec matching logic. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyen Thai Ngoc Duy committed Jan 15, 2012 at 17:03 UTC 4838237cb73a13d38a7e4348b71be96b60eed21e

2 files changed +10

diff-lib.c

@@ -469,6 +469,8 @@ static int diff_cache(struct rev_info *revs,

469 opts.src_index = &the_index;

470 opts.dst_index = NULL;

471 opts.pathspec = &revs->diffopt.pathspec;

472 + opts.pathspec->recursive = 1;

473 + opts.pathspec->max_depth = -1;

474

475 init_tree_desc(&t, tree->buffer, tree->size);

476 return unpack_trees(1, &t, &opts);

t/t4010-diff-pathspec.sh

@@ -47,6 +47,14 @@ test_expect_success \

47 'git diff-index --cached $tree -- path1/ >current &&

48 compare_diff_raw current expected'

50 +cat >expected <<\EOF

51 +:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1

52 +EOF

53 +test_expect_success \

54 + '"*file1" should show path1/file1' \

55 + 'git diff-index --cached $tree -- "*file1" >current &&

56 + compare_diff_raw current expected'

57 +

58 cat >expected <<\EOF

59 :100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M file0

60 EOF