8a92df033e
While doing any kind of git loading, unset HOME variables and set NOSYSTEM variables so that cgit does not load any settings that a user may have set for his own /usr/bin/git usage. This fixes a fatal error introduced with git 1.8, whereupon git would fatally exit when failing to access particular files. The result of this is that only repo-local configuration files are accessed: zx2c4@thinkpad ~/Projects/cgit $ HOME=/root QUERY_STRING="url=foo/log" CGIT_CONFIG=tests/trash/cgitrc strace -e access ./cgit >/dev/null access("/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory) access("repos/foo/.git/objects", X_OK) = 0 access("repos/foo/.git/refs", X_OK) = 0 access("repos/foo/.git/config", R_OK) = 0 access("repos/foo/.git/config", R_OK) = 0 access("repos/foo/.git/objects/b3/bafdbf0183f4897ef8b1319cb8c490ed54717e", F_OK) = 0 access("repos/foo/.git/objects/b3/bafdbf0183f4897ef8b1319cb8c490ed54717e", F_OK) = 0 access("repos/foo/.git/objects/b3/bafdbf0183f4897ef8b1319cb8c490ed54717e", F_OK) = 0 access("repos/foo/.git/objects/b3/bafdbf0183f4897ef8b1319cb8c490ed54717e", F_OK) = 0 +++ exited with 0 +++ Reported-by: Ferry Huberts <ferry.huberts@pelagic.nl> Tested-by: Jason A. Donenfeld <Jason@zx2c4.com> Tested-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
145 regels
4.0 KiB
C
145 regels
4.0 KiB
C
/* ui-commit.c: generate commit view
|
|
*
|
|
* Copyright (C) 2006 Lars Hjemli
|
|
*
|
|
* Licensed under GNU General Public License v2
|
|
* (see COPYING for full license text)
|
|
*/
|
|
|
|
#include "cgit.h"
|
|
#include "ui-commit.h"
|
|
#include "html.h"
|
|
#include "ui-shared.h"
|
|
#include "ui-diff.h"
|
|
#include "ui-log.h"
|
|
|
|
void cgit_print_commit(char *hex, const char *prefix)
|
|
{
|
|
struct commit *commit, *parent;
|
|
struct commitinfo *info, *parent_info;
|
|
struct commit_list *p;
|
|
struct strbuf notes = STRBUF_INIT;
|
|
unsigned char sha1[20];
|
|
char *tmp, *tmp2;
|
|
int parents = 0;
|
|
|
|
if (!hex)
|
|
hex = ctx.qry.head;
|
|
|
|
if (get_sha1(hex, sha1)) {
|
|
cgit_print_error("Bad object id: %s", hex);
|
|
return;
|
|
}
|
|
commit = lookup_commit_reference(sha1);
|
|
if (!commit) {
|
|
cgit_print_error("Bad commit reference: %s", hex);
|
|
return;
|
|
}
|
|
info = cgit_parse_commit(commit);
|
|
|
|
format_display_notes(sha1, ¬es, PAGE_ENCODING, 0);
|
|
|
|
load_ref_decorations(DECORATE_FULL_REFS);
|
|
|
|
cgit_print_diff_ctrls();
|
|
html("<table summary='commit info' class='commit-info'>\n");
|
|
html("<tr><th>author</th><td>");
|
|
html_txt(info->author);
|
|
if (!ctx.cfg.noplainemail) {
|
|
html(" ");
|
|
html_txt(info->author_email);
|
|
}
|
|
html("</td><td class='right'>");
|
|
cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
|
|
html("</td></tr>\n");
|
|
html("<tr><th>committer</th><td>");
|
|
html_txt(info->committer);
|
|
if (!ctx.cfg.noplainemail) {
|
|
html(" ");
|
|
html_txt(info->committer_email);
|
|
}
|
|
html("</td><td class='right'>");
|
|
cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
|
|
html("</td></tr>\n");
|
|
html("<tr><th>commit</th><td colspan='2' class='sha1'>");
|
|
tmp = sha1_to_hex(commit->object.sha1);
|
|
cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
|
|
html(" (");
|
|
cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
|
|
html(")</td></tr>\n");
|
|
html("<tr><th>tree</th><td colspan='2' class='sha1'>");
|
|
tmp = xstrdup(hex);
|
|
cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
|
|
ctx.qry.head, tmp, NULL);
|
|
if (prefix) {
|
|
html(" /");
|
|
cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
|
|
}
|
|
free(tmp);
|
|
html("</td></tr>\n");
|
|
for (p = commit->parents; p; p = p->next) {
|
|
parent = lookup_commit_reference(p->item->object.sha1);
|
|
if (!parent) {
|
|
html("<tr><td colspan='3'>");
|
|
cgit_print_error("Error reading parent commit");
|
|
html("</td></tr>");
|
|
continue;
|
|
}
|
|
html("<tr><th>parent</th>"
|
|
"<td colspan='2' class='sha1'>");
|
|
tmp = tmp2 = sha1_to_hex(p->item->object.sha1);
|
|
if (ctx.repo->enable_subject_links) {
|
|
parent_info = cgit_parse_commit(parent);
|
|
tmp2 = parent_info->subject;
|
|
}
|
|
cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
|
|
html(" (");
|
|
cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
|
|
sha1_to_hex(p->item->object.sha1), prefix, 0);
|
|
html(")</td></tr>");
|
|
parents++;
|
|
}
|
|
if (ctx.repo->snapshots) {
|
|
html("<tr><th>download</th><td colspan='2' class='sha1'>");
|
|
cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
|
|
hex, ctx.repo->snapshots);
|
|
html("</td></tr>");
|
|
}
|
|
html("</table>\n");
|
|
html("<div class='commit-subject'>");
|
|
if (ctx.repo->commit_filter)
|
|
cgit_open_filter(ctx.repo->commit_filter);
|
|
html_txt(info->subject);
|
|
if (ctx.repo->commit_filter)
|
|
cgit_close_filter(ctx.repo->commit_filter);
|
|
show_commit_decorations(commit);
|
|
html("</div>");
|
|
html("<div class='commit-msg'>");
|
|
if (ctx.repo->commit_filter)
|
|
cgit_open_filter(ctx.repo->commit_filter);
|
|
html_txt(info->msg);
|
|
if (ctx.repo->commit_filter)
|
|
cgit_close_filter(ctx.repo->commit_filter);
|
|
html("</div>");
|
|
if (notes.len != 0) {
|
|
html("<div class='notes-header'>Notes</div>");
|
|
html("<div class='notes'>");
|
|
if (ctx.repo->commit_filter)
|
|
cgit_open_filter(ctx.repo->commit_filter);
|
|
html_txt(notes.buf);
|
|
if (ctx.repo->commit_filter)
|
|
cgit_close_filter(ctx.repo->commit_filter);
|
|
html("</div>");
|
|
html("<div class='notes-footer'></div>");
|
|
}
|
|
if (parents < 3) {
|
|
if (parents)
|
|
tmp = sha1_to_hex(commit->parents->item->object.sha1);
|
|
else
|
|
tmp = NULL;
|
|
cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0);
|
|
}
|
|
strbuf_release(¬es);
|
|
cgit_free_commitinfo(info);
|
|
}
|