Merge up to git v2.32.0

author: June McEnroe 2022-02-13 12:07:49 -0500
committer: June McEnroe 2022-02-13 12:10:49 -0500
commit: 516175469a8c6895496ef909b487992deb45f460 (patch)
tree: e0e8b4d38f05e870089de8babc0d3aca3bb4d3b0 /ui-commit.c
parent: Fix crash trying to print "this commit" on 404s (diff)
parent: git: update to v2.32.0 (diff)
download: cgit-516175469a8c6895496ef909b487992deb45f460.tar.gz
cgit-516175469a8c6895496ef909b487992deb45f460.zip
1 files changed, 5 insertions, 5 deletions
diff --git a/ui-commit.c b/ui-commit.c
index ee5d2c7..b49259e 100644
--- a/ui-commit.c
+++ b/ui-commit.c

@@ -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);
author	June McEnroe	2022-02-13 12:07:49 -0500
committer	June McEnroe	2022-02-13 12:10:49 -0500
commit	516175469a8c6895496ef909b487992deb45f460 (patch)
tree	e0e8b4d38f05e870089de8babc0d3aca3bb4d3b0 /ui-commit.c
parent	Fix crash trying to print "this commit" on 404s (diff)
parent	git: update to v2.32.0 (diff)
download	cgit-516175469a8c6895496ef909b487992deb45f460.tar.gz cgit-516175469a8c6895496ef909b487992deb45f460.zip

diff --git a/ui-commit.c b/ui-commit.c index ee5d2c7..b49259e 100644 --- a/ui-commit.c +++ b/ui-commit.c
@@ -71,13 +71,13 @@ void cgit_print_commit(char hex, const char prefix)
71	html_txt(show_date(info->committer_date, info->committer_tz,	71	html_txt(show_date(info->committer_date, info->committer_tz,
72	cgit_date_mode(DATE_ISO8601)));	72	cgit_date_mode(DATE_ISO8601)));
73	html("</td></tr>\n");	73	html("</td></tr>\n");
74	html("<tr><th>commit</th><td colspan='2' class='sha1'>");	74	html("<tr><th>commit</th><td colspan='2' class='oid'>");
75	tmp = oid_to_hex(&commit->object.oid);	75	tmp = oid_to_hex(&commit->object.oid);
76	cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);	76	cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);
77	html(" (");	77	html(" (");
78	cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);	78	cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
79	html(")</td></tr>\n");	79	html(")</td></tr>\n");
80	html("<tr><th>tree</th><td colspan='2' class='sha1'>");	80	html("<tr><th>tree</th><td colspan='2' class='oid'>");
81	tmp = xstrdup(hex);	81	tmp = xstrdup(hex);
82	cgit_tree_link(oid_to_hex(get_commit_tree_oid(commit)), NULL, NULL,	82	cgit_tree_link(oid_to_hex(get_commit_tree_oid(commit)), NULL, NULL,
83	ctx.qry.head, tmp, NULL);	83	ctx.qry.head, tmp, NULL);
@@ -96,7 +96,7 @@ void cgit_print_commit(char hex, const char prefix)
96	continue;	96	continue;
97	}	97	}
98	html("<tr><th>parent</th>"	98	html("<tr><th>parent</th>"
99	"<td colspan='2' class='sha1'>");	99	"<td colspan='2' class='oid'>");
100	tmp = tmp2 = oid_to_hex(&p->item->object.oid);	100	tmp = tmp2 = oid_to_hex(&p->item->object.oid);
101	if (ctx.repo->enable_subject_links) {	101	if (ctx.repo->enable_subject_links) {
102	parent_info = cgit_parse_commit(parent);	102	parent_info = cgit_parse_commit(parent);
@@ -110,7 +110,7 @@ void cgit_print_commit(char hex, const char prefix)
110	parents++;	110	parents++;
111	}	111	}
112	if (ctx.repo->snapshots) {	112	if (ctx.repo->snapshots) {
113	html("<tr><th>download</th><td colspan='2' class='sha1'>");	113	html("<tr><th>download</th><td colspan='2' class='oid'>");
114	cgit_print_snapshot_links(ctx.repo, hex, "<br/>");	114	cgit_print_snapshot_links(ctx.repo, hex, "<br/>");
115	html("</td></tr>");	115	html("</td></tr>");
116	}	116	}
@@ -140,7 +140,7 @@ void cgit_print_commit(char hex, const char prefix)
140	tmp = oid_to_hex(&commit->parents->item->object.oid);	140	tmp = oid_to_hex(&commit->parents->item->object.oid);
141	else	141	else
142	tmp = NULL;	142	tmp = NULL;
143	cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0);	143	cgit_print_diff(ctx.qry.oid, tmp, prefix, 0, 0);
144	}	144	}
145	strbuf_release(&notes);	145	strbuf_release(&notes);
146	cgit_free_commitinfo(info);	146	cgit_free_commitinfo(info);