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/sub-process.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'third_party/git/sub-process.h') diff --git a/third_party/git/sub-process.h b/third_party/git/sub-process.h index e85f21fa1a..5c182fad98 100644 --- a/third_party/git/sub-process.h +++ b/third_party/git/sub-process.h @@ -24,7 +24,7 @@ /* Members should not be accessed directly. */ struct subprocess_entry { - struct hashmap_entry ent; + struct hashmap_entry ent; /* must be the first member! */ 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 struct hashmap_entry *e, - const struct hashmap_entry *entry_or_key, + const void *e1, + const void *e2, const void *unused_keydata); /* -- cgit 1.4.1