maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge(3p/git): Merge git upstream at v2.26.2

Browse source
This commit is contained in:
Vincent Ambo 2020-05-22 17:46:45 +01:00
commit 5229c9b232
1006 changed files with 149006 additions and 60819 deletions
Download patch file Download diff file Expand all files Collapse all files

9
third_party/git/unpack-trees.h vendored
View file

@ -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,