From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/wt-status.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/git/wt-status.h') diff --git a/third_party/git/wt-status.h b/third_party/git/wt-status.h index 71c3f25f43..77dad5b920 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; - struct object_id oid_commit; /* when not Initial */ + unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */ /* These are computed during processing of the individual sections */ int committable; -- cgit 1.4.1