Merge up to git v2.32.0

27 files changed, 179 insertions, 193 deletions

@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.25.1
+GIT_VER = 2.32.0
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
@@ -408,12 +408,12 @@ int cache_process(int size, const char *path, const char *key, int ttl,
 static char *sprintftime(const char *format, time_t time)
 {
         static char buf[64];
-        struct tm *tm;
+        struct tm tm;
 
         if (!time)
                 return NULL;
-        tm = gmtime(&time);
-        strftime(buf, sizeof(buf)-1, format, tm);
+        gmtime_r(&time, &tm);
+        strftime(buf, sizeof(buf)-1, format, &tm);
         return buf;
 }
 
@@ -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")) {
@@ -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)
@@ -550,7 +550,7 @@ div#cgit table.diff td span.del {
         color: red;
 }
 
-div#cgit .sha1 {
+div#cgit .oid {
         font-family: monospace;
         font-size: 90%;
 }
@@ -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;
@@ -74,22 +74,22 @@ static void blame_fn(void)
 
 static void blob_fn(void)
 {
-        cgit_print_blob(ctx.qry.sha1, ctx.qry.path, ctx.qry.head, 0);
+        cgit_print_blob(ctx.qry.oid, ctx.qry.path, ctx.qry.head, 0);
 }
 
 static void commit_fn(void)
 {
-        cgit_print_commit(ctx.qry.sha1, ctx.qry.path);
+        cgit_print_commit(ctx.qry.oid, ctx.qry.path);
 }
 
 static void diff_fn(void)
 {
-        cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1, 0);
+        cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 1, 0);
 }
 
 static void rawdiff_fn(void)
 {
-        cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1, 1);
+        cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 1, 1);
 }
 
 static void info_fn(void)
@@ -99,7 +99,7 @@ static void info_fn(void)
 
 static void log_fn(void)
 {
-        cgit_print_log(ctx.qry.sha1, ctx.qry.ofs, ctx.cfg.max_commit_count,
+        cgit_print_log(ctx.qry.oid, ctx.qry.ofs, ctx.cfg.max_commit_count,
                        ctx.qry.grep, ctx.qry.search, ctx.qry.path, 1,
                        ctx.repo->enable_commit_graph,
                        ctx.repo->commit_sort);
@@ -125,7 +125,7 @@ static void repolist_fn(void)
 
 static void patch_fn(void)
 {
-        cgit_print_patch(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path);
+        cgit_print_patch(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path);
 }
 
 static void plain_fn(void)
@@ -140,7 +140,7 @@ static void refs_fn(void)
 
 static void snapshot_fn(void)
 {
-        cgit_print_snapshot(ctx.qry.head, ctx.qry.sha1, ctx.qry.path,
+        cgit_print_snapshot(ctx.qry.head, ctx.qry.oid, ctx.qry.path,
                             ctx.qry.nohead);
 }
 
@@ -156,12 +156,12 @@ static void summary_fn(void)
 
 static void tag_fn(void)
 {
-        cgit_print_tag(ctx.qry.sha1);
+        cgit_print_tag(ctx.qry.oid);
 }
 
 static void tree_fn(void)
 {
-        cgit_print_tree(ctx.qry.sha1, ctx.qry.path);
+        cgit_print_tree(ctx.qry.oid, ctx.qry.path);
 }
 
 #define def_cmd(name, want_repo, want_vpath, is_clone) \
@@ -19,7 +19,7 @@ regex=''
 
 # This expression generates links to commits referenced by their SHA1.
 regex=$regex'
-s|\b([0-9a-fA-F]{7,40})\b|<a href="./?id=\1">\1</a>|g'
+s|\b([0-9a-fA-F]{7,64})\b|<a href="./?id=\1">\1</a>|g'
 
 # This expression generates links to a fictional bugtracker.
 regex=$regex'
@@ -86,11 +86,7 @@ div#cgit .markdown-body h1 a.toclink, div#cgit .markdown-body h2 a.toclink, div#
     margin: 15px 0;
 }
 .markdown-body hr {
-    background: transparent url("/dirty-shade.png") repeat-x 0 0;
-    border: 0 none;
-    color: #ccc;
-    height: 4px;
-    padding: 0;
+    border: 2px solid #ccc;
 }
 .markdown-body>h2:first-child, .markdown-body>h1:first-child, .markdown-body>h1:first-child+h2, .markdown-body>h3:first-child, .markdown-body>h4:first-child, .markdown-body>h5:first-child, .markdown-body>h6:first-child {
     margin-top: 0;
@@ -301,6 +297,7 @@ markdown.markdownFromFile(
                 "markdown.extensions.fenced_code",
                 "markdown.extensions.codehilite",
                 "markdown.extensions.tables",
+                "markdown.extensions.sane_lists",
                 TocExtension(anchorlink=True)],
         extension_configs={
                 "markdown.extensions.codehilite":{"css_class":"highlight"}})
-Subproject c522f061d551c9bb8684a7c3859b2ece4499b56
+Subproject ebf3c04b262aa27fbb97f8a0156c2347fecafaf
@@ -127,7 +127,6 @@ static int end_of_header(const char *p)
 
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
-        const int sha1hex_len = 40;
         struct commitinfo *ret;
         const char *p = repo_get_commit_buffer(the_repository, commit, NULL);
         const char *t;
@@ -140,10 +139,10 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 
         if (!skip_prefix(p, "tree ", &p))
                 die("Bad commit: %s", oid_to_hex(&commit->object.oid));
-        p += sha1hex_len + 1;
+        p += the_hash_algo->hexsz + 1;
 
         while (skip_prefix(p, "parent ", &p))
-                p += sha1hex_len + 1;
+                p += the_hash_algo->hexsz + 1;
 
         if (p && skip_prefix(p, "author ", &p)) {
                 parse_user(p, &ret->author, &ret->author_email,
@@ -80,13 +80,17 @@ mkrepo() {
                         git commit -m "commit $n"
                         n=$(expr $n + 1)
                 done
-                if test "$3" = "testplus"
-                then
+                case "$3" in
+                testplus)
                         echo "hello" >a+b
                         git add a+b
                         git commit -m "add a+b"
                         git branch "1+2"
-                fi
+                        ;;
+                commit-graph)
+                        git commit-graph write
+                        ;;
+                esac
         )
 }
 
@@ -95,7 +99,7 @@ setup_repos()
         rm -rf cache
         mkdir -p cache
         mkrepo repos/foo 5 >/dev/null
-        mkrepo repos/bar 50 >/dev/null
+        mkrepo repos/bar 50 commit-graph >/dev/null
         mkrepo repos/foo+bar 10 testplus >/dev/null
         mkrepo "repos/with space" 2 >/dev/null
         mkrepo repos/filter 5 testplus >/dev/null
@@ -33,10 +33,10 @@ test_expect_success 'test submodule version matches Makefile' '
         else
                 (
                         cd ../.. &&
-                        sm_sha1=$(git ls-files --stage -- git |
+                        sm_oid=$(git ls-files --stage -- git |
                                 sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") &&
                         cd git &&
-                        git describe --match "v[0-9]*" $sm_sha1
+                        git describe --match "v[0-9]*" $sm_oid
                 ) | sed -e "s/^v//" -e "s/-/./" >sm_version &&
                 test_cmp sm_version makefile_version
         fi
@@ -25,7 +25,7 @@ test_expect_success 'get root commit' '
 '
 
 test_expect_success 'root commit contains diffstat' '
-        grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" tmp
+        grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40,64\}.>file-1</a>" tmp
 '
 
 test_expect_success 'root commit contains diff' '
@@ -25,7 +25,7 @@ test_expect_success 'verify gzip format' '
 
 test_expect_success 'untar' '
         rm -rf master &&
-        tar -xzf master.tar.gz
+        gzip -dc master.tar.gz | tar -xf -
 '
 
 test_expect_success 'count files' '
@@ -61,13 +61,12 @@ test_expect_success LZIP 'strip off the header lines' '
 '
 
 test_expect_success LZIP 'verify lzip format' '
-        lzip --test master.tar.lz &&
-        cp master.tar.lz /tmp/.
+        lzip --test master.tar.lz
 '
 
 test_expect_success LZIP 'untar' '
         rm -rf master &&
-        tar --lzip -xf master.tar.lz
+        lzip -dc master.tar.lz | tar -xf -
 '
 
 test_expect_success LZIP 'count files' '
@@ -103,13 +102,12 @@ test_expect_success XZ 'strip off the header lines' '
 '
 
 test_expect_success XZ 'verify xz format' '
-        xz --test master.tar.xz &&
-        cp master.tar.xz /tmp/.
+        xz --test master.tar.xz
 '
 
 test_expect_success XZ 'untar' '
         rm -rf master &&
-        tar --xz -xf master.tar.xz
+        xz -dc master.tar.xz | tar -xf -
 '
 
 test_expect_success XZ 'count files' '
@@ -145,13 +143,12 @@ test_expect_success ZSTD 'strip off the header lines' '
 '
 
 test_expect_success ZSTD 'verify zstd format' '
-        zstd --test master.tar.zst &&
-        cp master.tar.zst /tmp/.
+        zstd --test master.tar.zst
 '
 
 test_expect_success ZSTD 'untar' '
         rm -rf master &&
-        tar --zstd -xf master.tar.zst
+        zstd -dc master.tar.zst | tar -xf -
 '
 
 test_expect_success ZSTD 'count files' '
@@ -25,7 +25,7 @@ test_no_home_access () {
                 -E CGIT_CONFIG="$PWD/cgitrc" \
                 -E QUERY_STRING="url=$1" \
                 -e access -f -o strace.out cgit &&
-        test_must_fail grep "$non_existent_path" strace.out
+        ! grep "$non_existent_path" strace.out
 }
 
 test_no_home_access_success() {
@@ -10,7 +10,7 @@
 #include "ui-blame.h"
 #include "html.h"
 #include "ui-shared.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "blame.h"
 
 
@@ -48,7 +48,7 @@ static void emit_blame_entry_hash(struct blame_entry *ent)
         unsigned long line = 0;
 
         char *detail = emit_suspect_detail(suspect);
-        html("<span class='sha1'>");
+        html("<span class='oid'>");
         cgit_commit_link(find_unique_abbrev(oid, DEFAULT_ABBREV), detail,
                          NULL, ctx.qry.head, oid_to_hex(oid), suspect->path);
         html("</span>");
@@ -104,7 +104,7 @@ static void print_object(const struct object_id *oid, const char *path,
         enum object_type type;
         char *buf;
         unsigned long size;
-        struct argv_array rev_argv = ARGV_ARRAY_INIT;
+        struct strvec rev_argv = STRVEC_INIT;
         struct rev_info revs;
         struct blame_scoreboard sb;
         struct blame_origin *o;
@@ -124,15 +124,16 @@ static void print_object(const struct object_id *oid, const char *path,
                 return;
         }
 
-        argv_array_push(&rev_argv, "blame");
-        argv_array_push(&rev_argv, rev);
+        strvec_push(&rev_argv, "blame");
+        strvec_push(&rev_argv, rev);
         init_revisions(&revs, NULL);
         revs.diffopt.flags.allow_textconv = 1;
-        setup_revisions(rev_argv.argc, rev_argv.argv, &revs, NULL);
+        setup_revisions(rev_argv.nr, rev_argv.v, &revs, NULL);
         init_scoreboard(&sb);
         sb.revs = &revs;
         sb.repo = the_repository;
-        setup_scoreboard(&sb, path, &o);
+        sb.path = path;
+        setup_scoreboard(&sb, &o);
         o->suspects = blame_entry_prepend(NULL, 0, sb.num_lines, o);
         prio_queue_put(&sb.commits, o->commit);
         blame_origin_decref(o);
@@ -224,8 +225,7 @@ cleanup:
 }
 
 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;
 
@@ -260,7 +260,7 @@ static int basedir_len(const char *path)
 
 void cgit_print_blame(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 = {
@@ -294,10 +294,8 @@ void cgit_print_blame(void)
         walk_tree_ctx.match_baselen = (path_items.match) ?
                                        basedir_len(path_items.match) : -1;
 
-        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.state)
                 cgit_print_error_page(404, "Not found", "Not found");
         else if (walk_tree_ctx.state == 2)
@@ -19,7 +19,7 @@ struct walk_tree_context {
 };
 
 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;
 
@@ -56,9 +56,9 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
                 goto done;
         if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT)
                 goto done;
-        read_tree_recursive(the_repository,
-                            repo_get_commit_tree(the_repository, lookup_commit_reference(the_repository, &oid)),
-                            "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+        read_tree(the_repository,
+                  repo_get_commit_tree(the_repository, lookup_commit_reference(the_repository, &oid)),
+                  &paths, walk_tree, &walk_tree_ctx);
 
 done:
         free(path_items.match);
@@ -92,10 +92,8 @@ int cgit_print_file(char *path, const char *head, int file_only)
         type = oid_object_info(the_repository, &oid, &size);
         if (type == OBJ_COMMIT) {
                 commit = lookup_commit_reference(the_repository, &oid);
-                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.found_path)
                         return -1;
                 type = oid_object_info(the_repository, &oid, &size);
@@ -151,10 +149,8 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
 
         if ((!hex) && type == OBJ_COMMIT && path) {
                 commit = lookup_commit_reference(the_repository, &oid);
-                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);
                 type = oid_object_info(the_repository, &oid, &size);
         }
 
@@ -71,13 +71,13 @@ void cgit_print_commit(char *hex, const char *prefix)
         html_txt(show_date(info->committer_date, info->committer_tz,
                                 cgit_date_mode(DATE_ISO8601)));
         html("</td></tr>\n");
-        html("<tr><th>commit</th><td colspan='2' class='sha1'>");
+        html("<tr><th>commit</th><td colspan='2' class='oid'>");
         tmp = oid_to_hex(&commit->object.oid);
         cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);
         html(" (");
         cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
         html(")</td></tr>\n");
-        html("<tr><th>tree</th><td colspan='2' class='sha1'>");
+        html("<tr><th>tree</th><td colspan='2' class='oid'>");
         tmp = xstrdup(hex);
         cgit_tree_link(oid_to_hex(get_commit_tree_oid(commit)), NULL, NULL,
                        ctx.qry.head, tmp, NULL);
@@ -96,7 +96,7 @@ void cgit_print_commit(char *hex, const char *prefix)
                         continue;
                 }
                 html("<tr><th>parent</th>"
-                     "<td colspan='2' class='sha1'>");
+                     "<td colspan='2' class='oid'>");
                 tmp = tmp2 = oid_to_hex(&p->item->object.oid);
                 if (ctx.repo->enable_subject_links) {
                         parent_info = cgit_parse_commit(parent);
@@ -110,7 +110,7 @@ void cgit_print_commit(char *hex, const char *prefix)
                 parents++;
         }
         if (ctx.repo->snapshots) {
-                html("<tr><th>download</th><td colspan='2' class='sha1'>");
+                html("<tr><th>download</th><td colspan='2' class='oid'>");
                 cgit_print_snapshot_links(ctx.repo, hex, "<br/>");
                 html("</td></tr>");
         }
@@ -140,7 +140,7 @@ void cgit_print_commit(char *hex, const char *prefix)
                         tmp = oid_to_hex(&commit->parents->item->object.oid);
                 else
                         tmp = NULL;
-                cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0);
+                cgit_print_diff(ctx.qry.oid, tmp, prefix, 0, 0);
         }
         strbuf_release(&notes);
         cgit_free_commitinfo(info);
@@ -97,8 +97,8 @@ static void print_fileinfo(struct fileinfo *info)
                 html("]</span>");
         }
         htmlf("</td><td class='%s'>", class);
-        cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-                       ctx.qry.sha2, info->new_path);
+        cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.oid,
+                       ctx.qry.oid2, info->new_path);
         if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
                 htmlf(" (%s from ",
                       info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
@@ -194,8 +194,8 @@ static void cgit_print_diffstat(const struct object_id *old_oid,
         int i;
 
         html("<div class='diffstat-header'>");
-        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-                       ctx.qry.sha2, NULL);
+        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.oid,
+                       ctx.qry.oid2, NULL);
         if (prefix) {
                 html(" (limited to '");
                 html_txt(prefix);
@@ -10,7 +10,7 @@
 #include "ui-log.h"
 #include "html.h"
 #include "ui-shared.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 static int files, add_lines, rem_lines, lines_counted;
 
@@ -65,7 +65,7 @@ void show_commit_decorations(struct commit *commit)
                 return;
         html("<span class='decoration'>");
         while (deco) {
-                struct object_id peeled;
+                struct object_id oid_tag, peeled;
                 int is_annotated = 0;
 
                 strlcpy(buf, prettify_refname(deco->name), sizeof(buf));
@@ -82,8 +82,8 @@ void show_commit_decorations(struct commit *commit)
                         break;
                 case DECORATION_REF_TAG:
                         html(" ");
-                        if (!peel_ref(deco->name, &peeled))
-                                is_annotated = !oidcmp(&commit->object.oid, &peeled);
+                        if (!read_ref(deco->name, &oid_tag) && !peel_iterated_oid(&oid_tag, &peeled))
+                                is_annotated = !oideq(&oid_tag, &peeled);
                         cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
                         break;
                 case DECORATION_REF_REMOTE:
@@ -371,23 +371,23 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 {
         struct rev_info rev;
         struct commit *commit;
-        struct argv_array rev_argv = ARGV_ARRAY_INIT;
+        struct strvec rev_argv = STRVEC_INIT;
         int i, columns = commit_graph ? 4 : 3;
         int must_free_tip = 0;
 
         /* rev_argv.argv[0] will be ignored by setup_revisions */
-        argv_array_push(&rev_argv, "log_rev_setup");
+        strvec_push(&rev_argv, "log_rev_setup");
 
         if (!tip)
                 tip = ctx.qry.head;
         tip = disambiguate_ref(tip, &must_free_tip);
-        argv_array_push(&rev_argv, tip);
+        strvec_push(&rev_argv, tip);
 
         if (grep && pattern && *pattern) {
                 pattern = xstrdup(pattern);
                 if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
                     !strcmp(grep, "committer")) {
-                        argv_array_pushf(&rev_argv, "--%s=%s", grep, pattern);
+                        strvec_pushf(&rev_argv, "--%s=%s", grep, pattern);
                 } else if (!strcmp(grep, "range")) {
                         char *arg;
                         /* Split the pattern at whitespace and add each token
@@ -395,14 +395,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                          * rev-list options. Also, replace the previously
                          * pushed tip (it's no longer relevant).
                          */
-                        argv_array_pop(&rev_argv);
+                        strvec_pop(&rev_argv);
                         while ((arg = next_token(&pattern))) {
                                 if (*arg == '-') {
                                         fprintf(stderr, "Bad range expr: %s\n",
                                                 arg);
                                         break;
                                 }
-                                argv_array_push(&rev_argv, arg);
+                                strvec_push(&rev_argv, arg);
                         }
                 }
         }
@@ -417,22 +417,22 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         }
 
         if (commit_graph && !ctx.qry.follow) {
-                argv_array_push(&rev_argv, "--graph");
-                argv_array_push(&rev_argv, "--color");
+                strvec_push(&rev_argv, "--graph");
+                strvec_push(&rev_argv, "--color");
                 graph_set_column_colors(column_colors_html,
                                         COLUMN_COLORS_HTML_MAX);
         }
 
         if (commit_sort == 1)
-                argv_array_push(&rev_argv, "--date-order");
+                strvec_push(&rev_argv, "--date-order");
         else if (commit_sort == 2)
-                argv_array_push(&rev_argv, "--topo-order");
+                strvec_push(&rev_argv, "--topo-order");
 
         if (path && ctx.qry.follow)
-                argv_array_push(&rev_argv, "--follow");
-        argv_array_push(&rev_argv, "--");
+                strvec_push(&rev_argv, "--follow");
+        strvec_push(&rev_argv, "--");
         if (path)
-                argv_array_push(&rev_argv, path);
+                strvec_push(&rev_argv, path);
 
         init_revisions(&rev, NULL);
         rev.abbrev = DEFAULT_ABBREV;
@@ -441,7 +441,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         rev.show_root_diff = 0;
         rev.ignore_missing = 1;
         rev.simplify_history = 1;
-        setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
+        setup_revisions(rev_argv.nr, rev_argv.v, &rev, NULL);
         load_ref_decorations(NULL, DECORATE_FULL_REFS);
         rev.show_decorations = 1;
         rev.grep_filter.ignore_case = 1;
@@ -468,7 +468,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         if (pager) {
                 html(" (");
                 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
-                              NULL, ctx.qry.head, ctx.qry.sha1,
+                              NULL, ctx.qry.head, ctx.qry.oid,
                               ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
                               ctx.qry.search, ctx.qry.showmsg ? 0 : 1,
                               ctx.qry.follow);
@@ -524,7 +524,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                 if (ofs > 0) {
                         html("<li>");
                         cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
-                                      ctx.qry.sha1, ctx.qry.vpath,
+                                      ctx.qry.oid, ctx.qry.vpath,
                                       ofs - cnt, ctx.qry.grep,
                                       ctx.qry.search, ctx.qry.showmsg,
                                       ctx.qry.follow);
@@ -533,7 +533,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                 if ((commit = get_revision(&rev)) != NULL) {
                         html("<li>");
                         cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
-                                      ctx.qry.sha1, ctx.qry.vpath,
+                                      ctx.qry.oid, ctx.qry.vpath,
                                       ofs + cnt, ctx.qry.grep,
                                       ctx.qry.search, ctx.qry.showmsg,
                                       ctx.qry.follow);
@@ -61,7 +61,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
         }
 
         if (is_null_oid(&old_rev_oid)) {
-                memcpy(rev_range, oid_to_hex(&new_rev_oid), GIT_SHA1_HEXSZ + 1);
+                memcpy(rev_range, oid_to_hex(&new_rev_oid), the_hash_algo->hexsz + 1);
         } else {
                 xsnprintf(rev_range, REV_RANGE_LEN, "%s..%s", oid_to_hex(&old_rev_oid),
                         oid_to_hex(&new_rev_oid));
@@ -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)
@@ -22,10 +22,11 @@ static char *http_date(time_t t)
         static char month[][4] =
                 {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
                  "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-        struct tm *tm = gmtime(&t);
-        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
-                   tm->tm_mday, month[tm->tm_mon], 1900 + tm->tm_year,
-                   tm->tm_hour, tm->tm_min, tm->tm_sec);
+        struct tm tm;
+        gmtime_r(&t, &tm);
+        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm.tm_wday],
+                   tm.tm_mday, month[tm.tm_mon], 1900 + tm.tm_year,
+                   tm.tm_hour, tm.tm_min, tm.tm_sec);
 }
 
 void cgit_print_error(const char *fmt, ...)
@@ -521,45 +522,45 @@ static void cgit_self_link(char *name, const char *title, const char *class)
         else if (!strcmp(ctx.qry.page, "summary"))
                 cgit_summary_link(name, title, class, ctx.qry.head);
         else if (!strcmp(ctx.qry.page, "tag"))
-                cgit_tag_link(name, title, class, ctx.qry.has_sha1 ?
-                               ctx.qry.sha1 : ctx.qry.head);
+                cgit_tag_link(name, title, class, ctx.qry.has_oid ?
+                               ctx.qry.oid : ctx.qry.head);
         else if (!strcmp(ctx.qry.page, "tree"))
                 cgit_tree_link(name, title, class, ctx.qry.head,
-                               ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                               ctx.qry.has_oid ? ctx.qry.oid : NULL,
                                ctx.qry.path);
         else if (!strcmp(ctx.qry.page, "plain"))
                 cgit_plain_link(name, title, class, ctx.qry.head,
-                                ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                                ctx.qry.has_oid ? ctx.qry.oid : NULL,
                                 ctx.qry.path);
         else if (!strcmp(ctx.qry.page, "blame"))
                 cgit_blame_link(name, title, class, ctx.qry.head,
-                                ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                                ctx.qry.has_oid ? ctx.qry.oid : NULL,
                                 ctx.qry.path);
         else if (!strcmp(ctx.qry.page, "log"))
                 cgit_log_link(name, title, class, ctx.qry.head,
-                              ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                              ctx.qry.has_oid ? ctx.qry.oid : NULL,
                               ctx.qry.path, ctx.qry.ofs,
                               ctx.qry.grep, ctx.qry.search,
                               ctx.qry.showmsg, ctx.qry.follow);
         else if (!strcmp(ctx.qry.page, "commit"))
                 cgit_commit_link(name, title, class, ctx.qry.head,
-                                 ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                                 ctx.qry.has_oid ? ctx.qry.oid : NULL,
                                  ctx.qry.path);
         else if (!strcmp(ctx.qry.page, "patch"))
                 cgit_patch_link(name, title, class, ctx.qry.head,
-                                ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                                ctx.qry.has_oid ? ctx.qry.oid : NULL,
                                 ctx.qry.path);
         else if (!strcmp(ctx.qry.page, "refs"))
                 cgit_refs_link(name, title, class, ctx.qry.head,
-                               ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                               ctx.qry.has_oid ? ctx.qry.oid : NULL,
                                ctx.qry.path);
         else if (!strcmp(ctx.qry.page, "snapshot"))
                 cgit_snapshot_link(name, title, class, ctx.qry.head,
-                                   ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                                   ctx.qry.has_oid ? ctx.qry.oid : NULL,
                                    ctx.qry.path);
         else if (!strcmp(ctx.qry.page, "diff"))
                 cgit_diff_link(name, title, class, ctx.qry.head,
-                               ctx.qry.sha1, ctx.qry.sha2,
+                               ctx.qry.oid, ctx.qry.oid2,
                                ctx.qry.path);
         else if (!strcmp(ctx.qry.page, "stats"))
                 cgit_stats_link(name, title, class, ctx.qry.head,
@@ -927,10 +928,10 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
             strcmp(ctx.qry.head, ctx.repo->defbranch))
                 html_hidden("h", ctx.qry.head);
 
-        if (ctx.qry.sha1)
-                html_hidden("id", ctx.qry.sha1);
-        if (ctx.qry.sha2)
-                html_hidden("id2", ctx.qry.sha2);
+        if (ctx.qry.oid)
+                html_hidden("id", ctx.qry.oid);
+        if (ctx.qry.oid2)
+                html_hidden("id2", ctx.qry.oid2);
         if (ctx.qry.showmsg)
                 html_hidden("showmsg", "1");
 
@@ -1059,7 +1060,7 @@ void cgit_print_pageheader(void)
                                   ctx.qry.head);
                 html(" ");
                 cgit_refs_link("refs", NULL, hc("refs"), ctx.qry.head,
-                               ctx.qry.sha1, NULL);
+                               ctx.qry.oid, NULL);
                 html(" ");
                 cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
                               NULL, ctx.qry.vpath, 0, NULL, NULL,
@@ -1067,16 +1068,16 @@ void cgit_print_pageheader(void)
                 html(" ");
                 if (ctx.qry.page && !strcmp(ctx.qry.page, "blame"))
                         cgit_blame_link("blame", NULL, hc("blame"), ctx.qry.head,
-                                        ctx.qry.sha1, ctx.qry.vpath);
+                                        ctx.qry.oid, ctx.qry.vpath);
                 else
                         cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
-                                       ctx.qry.sha1, ctx.qry.vpath);
+                                        ctx.qry.oid, ctx.qry.vpath);
                 html(" ");
                 cgit_commit_link("commit", NULL, hc("commit"),
-                                 ctx.qry.head, ctx.qry.sha1, ctx.qry.vpath);
+                                 ctx.qry.head, ctx.qry.oid, ctx.qry.vpath);
                 html(" ");
                 cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head,
-                               ctx.qry.sha1, ctx.qry.sha2, ctx.qry.vpath);
+                               ctx.qry.oid, ctx.qry.oid2, ctx.qry.vpath);
                 if (ctx.repo->max_stats) {
                         html(" ");
                         cgit_stats_link("stats", NULL, hc("stats"),
@@ -13,35 +13,35 @@
 
 static int write_archive_type(const char *format, const char *hex, const char *prefix)
 {
-        struct argv_array argv = ARGV_ARRAY_INIT;
+        struct strvec argv = STRVEC_INIT;
         const char **nargv;
         int result;
-        argv_array_push(&argv, "snapshot");
-        argv_array_push(&argv, format);
+        strvec_push(&argv, "snapshot");
+        strvec_push(&argv, format);
         if (prefix) {
                 struct strbuf buf = STRBUF_INIT;
                 strbuf_addstr(&buf, prefix);
                 strbuf_addch(&buf, '/');
-                argv_array_push(&argv, "--prefix");
-                argv_array_push(&argv, buf.buf);
+                strvec_push(&argv, "--prefix");
+                strvec_push(&argv, buf.buf);
                 strbuf_release(&buf);
         }
-        argv_array_push(&argv, hex);
+        strvec_push(&argv, hex);
         /*
          * Now we need to copy the pointers to arguments into a new
          * structure because write_archive will rearrange its arguments
          * which may result in duplicated/missing entries causing leaks
-         * or double-frees in argv_array_clear.
+         * or double-frees in strvec_clear.
          */
-        nargv = xmalloc(sizeof(char *) * (argv.argc + 1));
-        /* argv_array guarantees a trailing NULL entry. */
-        memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
+        nargv = xmalloc(sizeof(char *) * (argv.nr + 1));
+        /* strvec guarantees a trailing NULL entry. */
+        memcpy(nargv, argv.v, sizeof(char *) * (argv.nr + 1));
 
         if (fflush(stdout))
                 return errno;
 
-        result = write_archive(argv.argc, nargv, NULL, the_repository, NULL, 0);
-        argv_array_clear(&argv);
+        result = write_archive(argv.nr, nargv, NULL, the_repository, NULL, 0);
+        strvec_clear(&argv);
         free(nargv);
         return result;
 }
@@ -166,7 +166,7 @@ static void add_commit(struct string_list *authors, struct commit *commit,
         struct authorstat *authorstat;
         struct string_list *items;
         char *tmp;
-        struct tm *date;
+        struct tm date;
         time_t t;
         uintptr_t *counter;
 
@@ -180,9 +180,9 @@ static void add_commit(struct string_list *authors, struct commit *commit,
         authorstat = author->util;
         items = &authorstat->list;
         t = info->committer_date;
-        date = gmtime(&t);
-        period->trunc(date);
-        tmp = xstrdup(period->pretty(date));
+        gmtime_r(&t, &date);
+        period->trunc(&date);
+        tmp = xstrdup(period->pretty(&date));
         item = string_list_insert(items, tmp);
         counter = (uintptr_t *)&item->util;
         if (*counter)
@@ -215,15 +215,15 @@ static struct string_list collect_stats(const struct cgit_period *period)
         int argc = 3;
         time_t now;
         long i;
-        struct tm *tm;
+        struct tm tm;
         char tmp[11];
 
         time(&now);
-        tm = gmtime(&now);
-        period->trunc(tm);
+        gmtime_r(&now, &tm);
+        period->trunc(&tm);
         for (i = 1; i < period->count; i++)
-                period->dec(tm);
-        strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm);
+                period->dec(&tm);
+        strftime(tmp, sizeof(tmp), "%Y-%m-%d", &tm);
         argv[2] = xstrdup(fmt("--since=%s", tmp));
         if (ctx.qry.path) {
                 argv[3] = "--";
@@ -261,21 +261,21 @@ static void print_combined_authorrow(struct string_list *authors, int from,
         struct string_list_item *date;
         time_t now;
         long i, j, total, subtotal;
-        struct tm *tm;
+        struct tm tm;
         char *tmp;
 
         time(&now);
-        tm = gmtime(&now);
-        period->trunc(tm);
+        gmtime_r(&now, &tm);
+        period->trunc(&tm);
         for (i = 1; i < period->count; i++)
-                period->dec(tm);
+                period->dec(&tm);
 
         total = 0;
         htmlf("<tr><td class='%s'>%s</td>", leftclass,
                 fmt(name, to - from + 1));
         for (j = 0; j < period->count; j++) {
-                tmp = period->pretty(tm);
-                period->inc(tm);
+                tmp = period->pretty(&tm);
+                period->inc(&tm);
                 subtotal = 0;
                 for (i = from; i <= to; i++) {
                         author = &authors->items[i];
@@ -300,20 +300,20 @@ static void print_authors(struct string_list *authors, int top,
         struct string_list_item *date;
         time_t now;
         long i, j, total;
-        struct tm *tm;
+        struct tm tm;
         char *tmp;
 
         time(&now);
-        tm = gmtime(&now);
-        period->trunc(tm);
+        gmtime_r(&now, &tm);
+        period->trunc(&tm);
         for (i = 1; i < period->count; i++)
-                period->dec(tm);
+                period->dec(&tm);
 
         html("<table class='stats'><tr><th>Author</th>");
         for (j = 0; j < period->count; j++) {
-                tmp = period->pretty(tm);
+                tmp = period->pretty(&tm);
                 htmlf("<th>%s</th>", tmp);
-                period->inc(tm);
+                period->inc(&tm);
         }
         html("<th>Total</th></tr>\n");
 
@@ -329,10 +329,10 @@ static void print_authors(struct string_list *authors, int top,
                 items = &authorstat->list;
                 total = 0;
                 for (j = 0; j < period->count; j++)
-                        period->dec(tm);
+                        period->dec(&tm);
                 for (j = 0; j < period->count; j++) {
-                        tmp = period->pretty(tm);
-                        period->inc(tm);
+                        tmp = period->pretty(&tm);
+                        period->inc(&tm);
                         date = string_list_lookup(items, tmp);
                         if (!date)
                                 html("<td>0</td>");
@@ -33,7 +33,7 @@ static void print_tag_content(char *buf)
 
 static void print_download_links(char *revname)
 {
-        html("<tr><th>download</th><td class='sha1'>");
+        html("<tr><th>download</th><td class='oid'>");
         cgit_print_snapshot_links(ctx.repo, revname, "<br/>");
         html("</td></tr>");
 }
@@ -91,7 +91,7 @@ void cgit_print_tag(char *revname)
                         cgit_close_filter(ctx.repo->email_filter);
                         html("</td></tr>\n");
                 }
-                html("<tr><td>tagged object</td><td class='sha1'>");
+                html("<tr><td>tagged object</td><td class='oid'>");
                 cgit_object_link(tag->tagged);
                 html("</td></tr>\n");
                 if (ctx.repo->snapshots)
@@ -106,7 +106,7 @@ void cgit_print_tag(char *revname)
                 html("<tr><td>tag name</td><td>");
                 html_txt(revname);
                 html("</td></tr>\n");
-                html("<tr><td>tagged object</td><td class='sha1'>");
+                html("<tr><td>tagged object</td><td class='oid'>");
                 cgit_object_link(obj);
                 html("</td></tr>\n");
                 if (ctx.repo->snapshots)
@@ -141,8 +141,7 @@ struct single_tree_ctx {
 };
 
 static int single_tree_cb(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 single_tree_ctx *ctx = cbdata;
 
@@ -187,8 +186,7 @@ static void write_tree_link(const struct object_id *oid, char *name,
                 tree_ctx.name = NULL;
                 tree_ctx.count = 0;
 
-                read_tree_recursive(the_repository, tree, "", 0, 1,
-                        &paths, single_tree_cb, &tree_ctx);
+                read_tree(the_repository, tree, &paths, single_tree_cb, &tree_ctx);
 
                 if (tree_ctx.count != 1)
                         break;
@@ -201,7 +199,7 @@ static void write_tree_link(const struct object_id *oid, char *name,
 }
 
 static int ls_item(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;
         char *name;
@@ -320,14 +318,13 @@ static void ls_tree(const struct object_id *oid, const char *path, struct walk_t
         }
 
         ls_head();
-        read_tree_recursive(the_repository, tree, "", 0, 1,
-                &paths, ls_item, walk_tree_ctx);
+        read_tree(the_repository, tree, &paths, ls_item, walk_tree_ctx);
         ls_tail();
 }
 
 
 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;
 
@@ -352,7 +349,7 @@ static int walk_tree(const struct object_id *oid, struct strbuf *base,
                         return 0;
                 }
         }
-        ls_item(oid, base, pathname, mode, stage, walk_tree_ctx);
+        ls_item(oid, base, pathname, mode, walk_tree_ctx);
         return 0;
 }
 
@@ -400,10 +397,8 @@ void cgit_print_tree(const char *rev, char *path)
                 goto cleanup;
         }
 
-        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.state == 1)
                 ls_tail();
         else if (walk_tree_ctx.state == 2)