diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-22T16·46+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-22T16·46+0100 |
| commit | 5229c9b232de5bfa959ad6ebbb4c8192ac513352 (patch) | |
| tree | 8539e7e23682cac110900f946f034ae44162cacd /third_party/git/unpack-trees.h | |
| parent | f2b211131f2347342dde63975b09cf603149f1a3 (diff) | |
| parent | 8518a7a51faaf50f830646d4c3585f51236b9349 (diff) | |
merge(3p/git): Merge git upstream at v2.26.2 r/808
Diffstat (limited to 'third_party/git/unpack-trees.h')
| -rw-r--r-- | third_party/git/unpack-trees.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/third_party/git/unpack-trees.h b/third_party/git/unpack-trees.h index d344d7d29694..ae1557fb8046 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 8 +#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES struct cache_entry; struct unpack_trees_options; -struct exclude_list; +struct pattern_list; typedef int (*merge_fn_t)(const struct cache_entry * const *src, struct unpack_trees_options *options); @@ -59,7 +59,8 @@ struct unpack_trees_options { quiet, exiting_early, show_all_errors, - dry_run; + dry_run, + keep_pattern_list; const char *prefix; int cache_bottom; struct dir_struct *dir; @@ -83,7 +84,7 @@ struct unpack_trees_options { struct index_state *src_index; struct index_state result; - struct exclude_list *el; /* for internal use */ + struct pattern_list *pl; /* for internal use */ }; int unpack_trees(unsigned n, struct tree_desc *t, |