about summary refs log tree commit diff
path: root/third_party/git/wt-status.h
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-22T16·46+0100
committerVincent Ambo <tazjin@google.com>2020-05-22T16·46+0100
commit5229c9b232de5bfa959ad6ebbb4c8192ac513352 (patch)
tree8539e7e23682cac110900f946f034ae44162cacd /third_party/git/wt-status.h
parentf2b211131f2347342dde63975b09cf603149f1a3 (diff)
parent8518a7a51faaf50f830646d4c3585f51236b9349 (diff)
merge(3p/git): Merge git upstream at v2.26.2 r/808
Diffstat (limited to 'third_party/git/wt-status.h')
-rw-r--r--third_party/git/wt-status.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/wt-status.h b/third_party/git/wt-status.h
index 77dad5b92048..71c3f25f43de 100644
--- a/third_party/git/wt-status.h
+++ b/third_party/git/wt-status.h
@@ -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;