aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
m---------git0
-rw-r--r--parsing.c4
-rw-r--r--shared.c4
-rw-r--r--ui-atom.c2
-rw-r--r--ui-clone.c2
-rw-r--r--ui-commit.c12
-rw-r--r--ui-diff.c6
-rw-r--r--ui-log.c12
-rw-r--r--ui-patch.c2
-rw-r--r--ui-plain.c2
-rw-r--r--ui-shared.c2
-rw-r--r--ui-tree.c2
13 files changed, 26 insertions, 26 deletions
diff --git a/Makefile b/Makefile
index 77b9f60..9bb9cd5 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.6.1
+GIT_VER = 2.7.0
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
INSTALL = install
COPYTREE = cp -r
diff --git a/git b/git
-Subproject 22f698cb188243b313e024d618283e0293e3714
+Subproject 754884255bb580df159e58defa81cdd30b5c430
diff --git a/parsing.c b/parsing.c
index f903c7c..5283e58 100644
--- a/parsing.c
+++ b/parsing.c
@@ -139,7 +139,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
return ret;
if (!skip_prefix(p, "tree ", &p))
- die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
+ die("Bad commit: %s", oid_to_hex(&commit->object.oid));
p += sha1hex_len + 1;
while (skip_prefix(p, "parent ", &p))
@@ -199,7 +199,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
const char *p;
struct taginfo *ret = NULL;
- data = read_sha1_file(tag->object.sha1, &type, &size);
+ data = read_sha1_file(tag->object.oid.hash, &type, &size);
if (!data || type != OBJ_TAG)
goto cleanup;
diff --git a/shared.c b/shared.c
index e216c64..42b2ddc 100644
--- a/shared.c
+++ b/shared.c
@@ -402,8 +402,8 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
unsigned char *old_sha1 = NULL;
if (commit->parents)
- old_sha1 = commit->parents->item->object.sha1;
- cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix,
+ old_sha1 = commit->parents->item->object.oid.hash;
+ cgit_diff_tree(old_sha1, commit->object.oid.hash, fn, prefix,
ctx.qry.ignorews);
}
diff --git a/ui-atom.c b/ui-atom.c
index e186299..11ea0c0 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -19,7 +19,7 @@ static void add_entry(struct commit *commit, const char *host)
struct commitinfo *info;
info = cgit_parse_commit(commit);
- hex = sha1_to_hex(commit->object.sha1);
+ hex = oid_to_hex(&commit->object.oid);
html("<entry>\n");
html("<title>");
html_txt(info->subject);
diff --git a/ui-clone.c b/ui-clone.c
index f7b0b04..5f6606a 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -24,7 +24,7 @@ static int print_ref_info(const char *refname, const struct object_id *oid,
if (obj->type == OBJ_TAG) {
if (!(obj = deref_tag(obj, refname, 0)))
return 0;
- htmlf("%s\t%s^{}\n", sha1_to_hex(obj->sha1), refname);
+ htmlf("%s\t%s^{}\n", oid_to_hex(&obj->oid), refname);
}
return 0;
}
diff --git a/ui-commit.c b/ui-commit.c
index 2bca7a0..0c3d740 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -69,14 +69,14 @@ void cgit_print_commit(char *hex, const char *prefix)
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);
+ 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'>");
tmp = xstrdup(hex);
- cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
+ cgit_tree_link(oid_to_hex(&commit->tree->object.oid), NULL, NULL,
ctx.qry.head, tmp, NULL);
if (prefix) {
html(" /");
@@ -85,7 +85,7 @@ void cgit_print_commit(char *hex, const char *prefix)
free(tmp);
html("</td></tr>\n");
for (p = commit->parents; p; p = p->next) {
- parent = lookup_commit_reference(p->item->object.sha1);
+ parent = lookup_commit_reference(p->item->object.oid.hash);
if (!parent) {
html("<tr><td colspan='3'>");
cgit_print_error("Error reading parent commit");
@@ -94,7 +94,7 @@ void cgit_print_commit(char *hex, const char *prefix)
}
html("<tr><th>parent</th>"
"<td colspan='2' class='sha1'>");
- tmp = tmp2 = sha1_to_hex(p->item->object.sha1);
+ tmp = tmp2 = oid_to_hex(&p->item->object.oid);
if (ctx.repo->enable_subject_links) {
parent_info = cgit_parse_commit(parent);
tmp2 = parent_info->subject;
@@ -102,7 +102,7 @@ void cgit_print_commit(char *hex, const char *prefix)
cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix);
html(" (");
cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
- sha1_to_hex(p->item->object.sha1), prefix);
+ oid_to_hex(&p->item->object.oid), prefix);
html(")</td></tr>");
parents++;
}
@@ -135,7 +135,7 @@ void cgit_print_commit(char *hex, const char *prefix)
}
if (parents < 3) {
if (parents)
- tmp = sha1_to_hex(commit->parents->item->object.sha1);
+ tmp = oid_to_hex(&commit->parents->item->object.oid);
else
tmp = NULL;
cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0);
diff --git a/ui-diff.c b/ui-diff.c
index 5d18296..52ed942 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -413,7 +413,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
"Bad commit: %s", sha1_to_hex(new_rev_sha1));
return;
}
- new_tree_sha1 = commit->tree->object.sha1;
+ new_tree_sha1 = commit->tree->object.oid.hash;
if (old_rev) {
if (get_sha1(old_rev, old_rev_sha1)) {
@@ -422,7 +422,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
return;
}
} else if (commit->parents && commit->parents->item) {
- hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
+ hashcpy(old_rev_sha1, commit->parents->item->object.oid.hash);
} else {
hashclr(old_rev_sha1);
}
@@ -434,7 +434,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
"Bad commit: %s", sha1_to_hex(old_rev_sha1));
return;
}
- old_tree_sha1 = commit2->tree->object.sha1;
+ old_tree_sha1 = commit2->tree->object.oid.hash;
} else {
old_tree_sha1 = NULL;
}
diff --git a/ui-log.c b/ui-log.c
index 0782478..4573255 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -82,14 +82,14 @@ void show_commit_decorations(struct commit *commit)
goto next;
strncpy(buf, deco->name + 13, sizeof(buf) - 1);
cgit_log_link(buf, NULL, "remote-deco", NULL,
- sha1_to_hex(commit->object.sha1),
+ oid_to_hex(&commit->object.oid),
ctx.qry.vpath, 0, NULL, NULL,
ctx.qry.showmsg, 0);
}
else {
strncpy(buf, deco->name, sizeof(buf) - 1);
cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
- sha1_to_hex(commit->object.sha1),
+ oid_to_hex(&commit->object.oid),
ctx.qry.vpath);
}
next:
@@ -148,8 +148,8 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
rem_lines = 0;
DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
- diff_tree_sha1(parent->tree->object.sha1,
- commit->tree->object.sha1,
+ diff_tree_sha1(parent->tree->object.oid.hash,
+ commit->tree->object.oid.hash,
"", &revs->diffopt);
diffcore_std(&revs->diffopt);
@@ -233,7 +233,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
}
}
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
- sha1_to_hex(commit->object.sha1), ctx.qry.vpath);
+ oid_to_hex(&commit->object.oid), ctx.qry.vpath);
show_commit_decorations(commit);
html("</td><td>");
cgit_open_filter(ctx.repo->email_filter, info->author_email, "log");
@@ -269,7 +269,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
strbuf_addstr(&msgbuf, info->msg);
strbuf_addch(&msgbuf, '\n');
}
- format_display_notes(commit->object.sha1,
+ format_display_notes(commit->object.oid.hash,
&msgbuf, PAGE_ENCODING, 0);
strbuf_addch(&msgbuf, '\n');
strbuf_ltrim(&msgbuf);
diff --git a/ui-patch.c b/ui-patch.c
index 430231e..4c051e8 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -48,7 +48,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
return;
}
} else if (commit->parents && commit->parents->item) {
- hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
+ hashcpy(old_rev_sha1, commit->parents->item->object.oid.hash);
} else {
hashclr(old_rev_sha1);
}
diff --git a/ui-plain.c b/ui-plain.c
index e4beb99..58addab 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -183,7 +183,7 @@ void cgit_print_plain(void)
if (!path_items.match) {
path_items.match = "";
walk_tree_ctx.match_baselen = -1;
- print_dir(commit->tree->object.sha1, "", 0, "");
+ print_dir(commit->tree->object.oid.hash, "", 0, "");
walk_tree_ctx.match = 2;
}
else
diff --git a/ui-shared.c b/ui-shared.c
index c04f380..48358cc 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -525,7 +525,7 @@ void cgit_object_link(struct object *obj)
{
char *page, *shortrev, *fullrev, *name;
- fullrev = sha1_to_hex(obj->sha1);
+ fullrev = oid_to_hex(&obj->oid);
shortrev = xstrdup(fullrev);
shortrev[10] = '\0';
if (obj->type == OBJ_COMMIT) {
diff --git a/ui-tree.c b/ui-tree.c
index d71503d..3ff2320 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -287,7 +287,7 @@ void cgit_print_tree(const char *rev, char *path)
walk_tree_ctx.curr_rev = xstrdup(rev);
if (path == NULL) {
- ls_tree(commit->tree->object.sha1, NULL, &walk_tree_ctx);
+ ls_tree(commit->tree->object.oid.hash, NULL, &walk_tree_ctx);
goto cleanup;
}
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2024-11-04 21:31:19 +0000