diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:36 -0700 |
| commit | fc26f57b847b86ba330ea543a6dfc86a10d4cce3 (patch) | |
| tree | 91e48380bbabaa47699db38c00c5c056d6ea48d2 /tree-walk.h | |
| parent | 57ded055c419183e43fd7841c1f9d2e774fa96e3 (diff) | |
| parent | 2f88c19700feb8db8f116f94bf558e61c82d543c (diff) | |
Merge branch 'jc/diff-index-unpack' into maint
* 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 'tree-walk.h')
| -rw-r--r-- | tree-walk.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tree-walk.h b/tree-walk.h index 39524b7dba..0089581e1d 100644 --- a/tree-walk.h +++ b/tree-walk.h @@ -44,6 +44,7 @@ struct traverse_info { struct traverse_info *prev; struct name_entry name; int pathlen; + struct pathspec *pathspec; unsigned long conflicts; traverse_callback_t fn; |