diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:35:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:35:53 -0700 |
| commit | 1b840a56629c8c0620c261672cc5d4d35ba253fa (patch) | |
| tree | 38691399a0fc7bb3bc5eac7f5e8b80dadbad573a /unpack-trees.h | |
| parent | 2c4610393195cc6f35ea79efadbc5c7fd7470891 (diff) | |
| parent | 2f88c19700feb8db8f116f94bf558e61c82d543c (diff) | |
| download | git-1b840a56629c8c0620c261672cc5d4d35ba253fa.tar.gz | |
Merge branch 'jc/diff-index-unpack'
* jc/diff-index-unpack:
diff-index: pass pathspec down to unpack-trees machinery
unpack-trees: allow pruning with pathspec
traverse_trees(): allow pruning with pathspec
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 7998948307..5e432f576e 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -52,6 +52,7 @@ struct unpack_trees_options { const char *prefix; int cache_bottom; struct dir_struct *dir; + struct pathspec *pathspec; merge_fn_t fn; const char *msgs[NB_UNPACK_TREES_ERROR_TYPES]; /* |