about summary refs log tree commit diff
path: root/third_party/git/sub-process.h
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/sub-process.h
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/sub-process.h')
-rw-r--r--third_party/git/sub-process.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/git/sub-process.h b/third_party/git/sub-process.h
index e85f21fa1a7c..5c182fad9853 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);
 
 /*