merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
6
third_party/git/sub-process.h
vendored
6
third_party/git/sub-process.h
vendored
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
/* Members should not be accessed directly. */
|
||||
struct subprocess_entry {
|
||||
struct hashmap_entry ent; /* must be the first member! */
|
||||
struct hashmap_entry ent;
|
||||
const char *cmd;
|
||||
struct child_process process;
|
||||
};
|
||||
|
|
@ -43,8 +43,8 @@ struct subprocess_capability {
|
|||
|
||||
/* Function to test two subprocess hashmap entries for equality. */
|
||||
int cmd2process_cmp(const void *unused_cmp_data,
|
||||
const void *e1,
|
||||
const void *e2,
|
||||
const struct hashmap_entry *e,
|
||||
const struct hashmap_entry *entry_or_key,
|
||||
const void *unused_keydata);
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue