diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-18 15:16:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-18 15:16:43 -0800 |
| commit | c74f97a624f6a79767d2e2d55d98bab5e2b02f16 (patch) | |
| tree | 4a28f82f00c00afba38a89c51452652ffc9a5a7d /diff-lib.c | |
| parent | 8ef7933880e6134f51d7bb5d7566b31ca93ee8c7 (diff) | |
| parent | 4838237cb73a13d38a7e4348b71be96b60eed21e (diff) | |
| download | git-c74f97a624f6a79767d2e2d55d98bab5e2b02f16.tar.gz | |
Merge branch 'nd/pathspec-recursion-cleanup'
* nd/pathspec-recursion-cleanup:
diff-index: enable recursive pathspec matching in unpack_trees
Document limited recursion pathspec matching with wildcards
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/diff-lib.c b/diff-lib.c index 62f4cd94cf..fc0dff31b5 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -469,6 +469,8 @@ static int diff_cache(struct rev_info *revs, opts.src_index = &the_index; opts.dst_index = NULL; opts.pathspec = &revs->diffopt.pathspec; + opts.pathspec->recursive = 1; + opts.pathspec->max_depth = -1; init_tree_desc(&t, tree->buffer, tree->size); return unpack_trees(1, &t, &opts); |