aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.h
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2022-05-01 11:08:26 +0200
committerFlorian Pritz <bluewind@xinu.at>2022-05-01 11:08:26 +0200
commit4f1bc7f9aa57da2ca84b475d472e23e22cc41e95 (patch)
tree37e7aec5ddc583047da1126ffdc41a81f20cf1f6 /cgit.h
parent2cbdd90e0f8575eda6486b4bb06521d848eaa307 (diff)
parent5258c297ba6fb604ae1415fbc19a3fe42457e49e (diff)
downloadcgit-4f1bc7f9aa57da2ca84b475d472e23e22cc41e95.tar.gz
cgit-4f1bc7f9aa57da2ca84b475d472e23e22cc41e95.tar.xz
Merge remote-tracking branch 'jason/master' into localHEADlocal
Diffstat (limited to 'cgit.h')
-rw-r--r--cgit.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cgit.h b/cgit.h
index 7ec46b4..69b5c13 100644
--- a/cgit.h
+++ b/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;