From 1e81ce6622ef790b297ff48f1d0286f51e225aee Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sat, 21 Nov 2020 19:59:36 +0100
Subject: merge(3p/cgit): subtree merge at adcc4f82

Change-Id: I16941629a17a2f39b9324cb85dc0cec6b104dfe4
---
 third_party/cgit/cgit.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'third_party/cgit/cgit.h')

diff --git a/third_party/cgit/cgit.h b/third_party/cgit/cgit.h
index 7ec46b484640..69b5c13232e7 100644
--- a/third_party/cgit/cgit.h
+++ b/third_party/cgit/cgit.h
@@ -14,7 +14,7 @@
 #include <tag.h>
 #include <diff.h>
 #include <diffcore.h>
-#include <argv-array.h>
+#include <strvec.h>
 #include <refs.h>
 #include <revision.h>
 #include <log-tree.h>
@@ -164,7 +164,7 @@ struct reflist {
 
 struct cgit_query {
 	int has_symref;
-	int has_sha1;
+	int has_oid;
 	int has_difftype;
 	char *raw;
 	char *repo;
@@ -172,8 +172,8 @@ struct cgit_query {
 	char *search;
 	char *grep;
 	char *head;
-	char *sha1;
-	char *sha2;
+	char *oid;
+	char *oid2;
 	char *path;
 	char *name;
 	char *url;
-- 
cgit 1.4.1