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
2
third_party/git/wt-status.h
vendored
2
third_party/git/wt-status.h
vendored
|
|
@ -116,7 +116,7 @@ struct wt_status {
|
|||
int rename_limit;
|
||||
enum wt_status_format status_format;
|
||||
struct wt_status_state state;
|
||||
unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */
|
||||
struct object_id oid_commit; /* when not Initial */
|
||||
|
||||
/* These are computed during processing of the individual sections */
|
||||
int committable;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue