diff options
author | June McEnroe <june@causal.agency> | 2021-06-08 14:30:12 -0400 |
---|---|---|
committer | June McEnroe <june@causal.agency> | 2021-06-08 14:34:33 -0400 |
commit | 044df6aad5675524c0b1051cfee03e1c8b2abd0e (patch) | |
tree | 0cca093309d205972a2643210e8f96e4a30a1c4e /www/git.causal.agency/cgit/cgit.c | |
parent | Fetch git .tar.gz for compatibility (diff) | |
parent | Squashed 'www/git.causal.agency/cgit/' changes from 55fa25ad..5258c297 (diff) | |
download | src-044df6aad5675524c0b1051cfee03e1c8b2abd0e.tar.gz src-044df6aad5675524c0b1051cfee03e1c8b2abd0e.zip |
Merge commit '5213546273ee798369ff594ad60077f1bef4655e'
Diffstat (limited to 'www/git.causal.agency/cgit/cgit.c')
-rw-r--r-- | www/git.causal.agency/cgit/cgit.c | 16 |
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) |