diff options
| author | June McEnroe <june@causal.agency> | 2021-06-08 14:27:44 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2021-06-08 14:27:44 -0400 |
| commit | 5213546273ee798369ff594ad60077f1bef4655e (patch) | |
| tree | 37e7aec5ddc583047da1126ffdc41a81f20cf1f6 /ui-plain.c | |
| parent | Squashed 'www/git.causal.agency/cgit/' content from commit 02221fd3 (diff) | |
| download | src-5213546273ee798369ff594ad60077f1bef4655e.tar.gz src-5213546273ee798369ff594ad60077f1bef4655e.zip | |
Squashed 'www/git.causal.agency/cgit/' changes from 55fa25ad..5258c297
5258c297 git: update to v2.32.0 6dbbffe0 git: update to v2.31.1 62eb8db4 md2html: use proper formatting for hr d889cae8 git: update to v2.31.0 4ffadc1e git: update to v2.30.1 bd6f5683 tests: t0107: support older and/or non-GNU tar f69626c6 md2html: use sane_lists extension cef27b67 git: update to v2.30.0 b1739247 git: update to v2.29.2 fe99c76e git: update to v2.29.1 adcc4f82 tests: try with commit-graph a1039ab1 tests: do not copy snapshots to /tmp/ a4de0e81 global: replace hard coded hash length 779631c6 global: replace references to 'sha1' with 'oid' 629659d2 git: update to v2.29.0 205837d4 git: update to v2.28.0 f780396c git: update to v2.27.0 0462f08d git: update to v2.26.0 git-subtree-dir: www/git.causal.agency/cgit git-subtree-split: 5258c297ba6fb604ae1415fbc19a3fe42457e49e
Diffstat (limited to 'ui-plain.c')
| -rw-r--r-- | ui-plain.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ui-plain.c b/ui-plain.c index 2a7b18cc..65a205fa 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -99,7 +99,7 @@ static void print_dir(const struct object_id *oid, const char *base, fullpath = NULL; } html("<li>"); - cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1, + cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.oid, fullpath); html("</li>\n"); } @@ -118,7 +118,7 @@ static void print_dir_entry(const struct object_id *oid, const char *base, if (S_ISGITLINK(mode)) { cgit_submodule_link(NULL, fullpath, oid_to_hex(oid)); } else - cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, + cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.oid, fullpath); html("</li>\n"); free(fullpath); @@ -130,7 +130,7 @@ static void print_dir_tail(void) } static int walk_tree(const struct object_id *oid, struct strbuf *base, - const char *pathname, unsigned mode, int stage, void *cbdata) + const char *pathname, unsigned mode, void *cbdata) { struct walk_tree_context *walk_tree_ctx = cbdata; @@ -163,7 +163,7 @@ static int basedir_len(const char *path) void cgit_print_plain(void) { - const char *rev = ctx.qry.sha1; + const char *rev = ctx.qry.oid; struct object_id oid; struct commit *commit; struct pathspec_item path_items = { @@ -198,9 +198,8 @@ void cgit_print_plain(void) } else walk_tree_ctx.match_baselen = basedir_len(path_items.match); - read_tree_recursive(the_repository, - repo_get_commit_tree(the_repository, commit), - "", 0, 0, &paths, walk_tree, &walk_tree_ctx); + read_tree(the_repository, repo_get_commit_tree(the_repository, commit), + &paths, walk_tree, &walk_tree_ctx); if (!walk_tree_ctx.match) cgit_print_error_page(404, "Not found", "Not found"); else if (walk_tree_ctx.match == 2) |