diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-18 15:48:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-18 15:48:46 -0800 |
| commit | d899cf559b6a93006993752e7a89d13606380227 (patch) | |
| tree | 267c22ffce9a9d705f48749d650ce2b62b690aa8 /diff-lib.c | |
| parent | ab8a78084b7159d99dae2905e1a3ff04c1500a6d (diff) | |
| parent | 00653435488f5ed86c5d6dc411fa14fa56f5e3bc (diff) | |
| download | git-d899cf559b6a93006993752e7a89d13606380227.tar.gz git-d899cf559b6a93006993752e7a89d13606380227.tar.xz | |
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7:
Git 1.7.7.6
diff-index: enable recursive pathspec matching in unpack_trees
Conflicts:
GIT-VERSION-GEN
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 62f4cd94c..fc0dff31b 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); |