diff options
Diffstat (limited to 'third_party/git/unpack-trees.h')
| -rw-r--r-- | third_party/git/unpack-trees.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/third_party/git/unpack-trees.h b/third_party/git/unpack-trees.h index ae1557fb80..d344d7d296 100644 --- a/third_party/git/unpack-trees.h +++ b/third_party/git/unpack-trees.h @@ -6,11 +6,11 @@ #include "string-list.h" #include "tree-walk.h" -#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES +#define MAX_UNPACK_TREES 8 struct cache_entry; struct unpack_trees_options; -struct pattern_list; +struct exclude_list; typedef int (*merge_fn_t)(const struct cache_entry * const *src, struct unpack_trees_options *options); @@ -59,8 +59,7 @@ struct unpack_trees_options { quiet, exiting_early, show_all_errors, - dry_run, - keep_pattern_list; + dry_run; const char *prefix; int cache_bottom; struct dir_struct *dir; @@ -84,7 +83,7 @@ struct unpack_trees_options { struct index_state *src_index; struct index_state result; - struct pattern_list *pl; /* for internal use */ + struct exclude_list *el; /* for internal use */ }; int unpack_trees(unsigned n, struct tree_desc *t, |