summary refs log tree commit diff
path: root/www/git.causal.agency/cgit/cgit.c
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-06-08 14:30:12 -0400
committerJune McEnroe <june@causal.agency>2021-06-08 14:34:33 -0400
commitd7bd11e9b326caad68b88ae5804b7b97c9282c16 (patch)
tree14b07a9e9865abc4c57513189e31af0afb6358fa /www/git.causal.agency/cgit/cgit.c
parentFetch git .tar.gz for compatibility (diff)
parentSquashed 'www/git.causal.agency/cgit/' changes from 55fa25ad..5258c297 (diff)
downloadsrc-d7bd11e9b326caad68b88ae5804b7b97c9282c16.tar.gz
src-d7bd11e9b326caad68b88ae5804b7b97c9282c16.zip
Merge commit 'f46c4521d761a0b9909e17ef29065c0aa09c7ab7'
Diffstat (limited to 'www/git.causal.agency/cgit/cgit.c')
-rw-r--r--www/git.causal.agency/cgit/cgit.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/www/git.causal.agency/cgit/cgit.c b/www/git.causal.agency/cgit/cgit.c
index 1d3a198f..a86970de 100644
--- a/www/git.causal.agency/cgit/cgit.c
+++ b/www/git.causal.agency/cgit/cgit.c
@@ -324,11 +324,11 @@ static void querystring_cb(const char *name, const char *value)
 		ctx.qry.head = xstrdup(value);
 		ctx.qry.has_symref = 1;
 	} else if (!strcmp(name, "id")) {
-		ctx.qry.sha1 = xstrdup(value);
-		ctx.qry.has_sha1 = 1;
+		ctx.qry.oid = xstrdup(value);
+		ctx.qry.has_oid = 1;
 	} else if (!strcmp(name, "id2")) {
-		ctx.qry.sha2 = xstrdup(value);
-		ctx.qry.has_sha1 = 1;
+		ctx.qry.oid2 = xstrdup(value);
+		ctx.qry.has_oid = 1;
 	} else if (!strcmp(name, "ofs")) {
 		ctx.qry.ofs = atoi(value);
 	} else if (!strcmp(name, "path")) {
@@ -986,9 +986,9 @@ static void cgit_parse_args(int argc, const char **argv)
 		} else if (skip_prefix(argv[i], "--head=", &arg)) {
 			ctx.qry.head = xstrdup(arg);
 			ctx.qry.has_symref = 1;
-		} else if (skip_prefix(argv[i], "--sha1=", &arg)) {
-			ctx.qry.sha1 = xstrdup(arg);
-			ctx.qry.has_sha1 = 1;
+		} else if (skip_prefix(argv[i], "--oid=", &arg)) {
+			ctx.qry.oid = xstrdup(arg);
+			ctx.qry.has_oid = 1;
 		} else if (skip_prefix(argv[i], "--ofs=", &arg)) {
 			ctx.qry.ofs = atoi(arg);
 		} else if (skip_prefix(argv[i], "--scan-tree=", &arg) ||
@@ -1031,7 +1031,7 @@ static int calc_ttl(void)
 	if (!strcmp(ctx.qry.page, "snapshot"))
 		return ctx.cfg.cache_snapshot_ttl;
 
-	if (ctx.qry.has_sha1)
+	if (ctx.qry.has_oid)
 		return ctx.cfg.cache_static_ttl;
 
 	if (ctx.qry.has_symref)