diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·58+0100 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·58+0100 |
| commit | 5d4756e75ce12a6b67af3a16193f10047ba05218 (patch) | |
| tree | d631c73d8c7a9d2856e4be6ac25faf1cbed588cd /cgit.c | |
| parent | 723dc8fbcb1a4609c264758eae420ee2811a2b55 (diff) | |
Squashed 'third_party/cgit/' changes from 8fc0c81bbb..adcc4f822f
adcc4f822f tests: try with commit-graph a1039ab175 tests: do not copy snapshots to /tmp/ a4de0e810b global: replace hard coded hash length 779631c6dc global: replace references to 'sha1' with 'oid' 629659d2cf git: update to v2.29.0 205837d468 git: update to v2.28.0 f780396c0a git: update to v2.27.0 0462f08d85 git: update to v2.26.0 55fa25adb0 Bump version 6a8d6d4b50 global: use proper accessors for maybe_tree 892ba8c3cc ui-snapshot: add support for zstd compression cc230bf044 tests: add tests for xz compressed snapshots 06671f4b21 ui-snapshot: add support for lzip compression fde897b817 git: update to v2.25.1 5e49023b01 tests: allow to skip git version tests fa146ccabd Bump version bd68c98879 git: update to v2.25.0 ca98c9e7bf tests: skip tests if strace is not functional d8e5dd25a0 git: update to v2.24.1 583aa5d80e ui-repolist: do not return unsigned (negative) value bfabd4519c git: update to v2.24.0 git-subtree-dir: third_party/cgit git-subtree-split: adcc4f822fe11836e5f942fc1ae0f00db4eb8d5f
Diffstat (limited to 'cgit.c')
| -rw-r--r-- | cgit.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cgit.c b/cgit.c index ac8c6418ba..08d81a1d4b 100644 --- a/cgit.c +++ b/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")) { @@ -579,7 +579,7 @@ static void prepare_repo_env(int *nongit) * load local configuration from the git repository, so we do them both while * the HOME variables are unset. */ setup_git_directory_gently(nongit); - init_display_notes(NULL); + load_display_notes(NULL); } static int prepare_repo_cmd(int nongit) @@ -992,9 +992,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) || @@ -1037,7 +1037,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) |