about summary refs log tree commit
path: root/ui-commit.c
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2016-01-05 07:38:53 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2016-01-13 17:12:17 +0100
commit559ab5ecc4445c8477ecf62c9fc97efa412dd562 (patch)
treeef19237ed99976f886ad6ca660f9a9961b4e656a /ui-commit.c
parent6edc84bc44d55d7f90a40238ae2107913e15f54b (diff)
downloadcgit-559ab5ecc4445c8477ecf62c9fc97efa412dd562.tar.gz
git: update to v2.7.0
Update to git version v2.7.0.

* Upstream commit ed1c9977cb1b63e4270ad8bdf967a2d02580aa08 (Remove
  get_object_hash.) changed API:

  Convert all instances of get_object_hash to use an appropriate
  reference to the hash member of the oid member of struct object.
  This provides no functional change, as it is essentially a macro
  substitution.

Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'ui-commit.c')
-rw-r--r--ui-commit.c12
1 files changed, 6 insertions, 6 deletions
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);