diff options
author | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·59+0100 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2020-11-21T19·09+0100 |
commit | 1e81ce6622ef790b297ff48f1d0286f51e225aee (patch) | |
tree | 152c022824a5cd4970bb41daa1fe94937b87a0e9 /third_party/cgit/cgit.h | |
parent | f4609b896fac842433bd495c166d5987852a6a73 (diff) |
merge(3p/cgit): subtree merge at adcc4f82 r/1891
Change-Id: I16941629a17a2f39b9324cb85dc0cec6b104dfe4
Diffstat (limited to 'third_party/cgit/cgit.h')
-rw-r--r-- | third_party/cgit/cgit.h | 8 |
1 files changed, 4 insertions, 4 deletions
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; |