mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert(3p/git): Revert merge of git upstream at v2.26.2

Browse source 
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232, reversing
changes made to f2b211131f.
This commit is contained in:
Vincent Ambo 2020-05-26 00:06:52 +01:00
parent 6f8fbf4aa4
commit 93ba78d6f4
1006 changed files with 60537 additions and 148724 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 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,