about summary refs log tree commit diff stats
path: root/ui-log.c
diff options
context:
space:
mode:
authorChristian Hesse2016-01-05 07:38:53 +0100
committerJason A. Donenfeld2016-01-13 17:12:17 +0100
commit559ab5ecc4445c8477ecf62c9fc97efa412dd562 (patch)
treeef19237ed99976f886ad6ca660f9a9961b4e656a /ui-log.c
parentui-repolist: initialize char *buf to NULL (diff)
downloadcgit-559ab5ecc4445c8477ecf62c9fc97efa412dd562.tar.gz
cgit-559ab5ecc4445c8477ecf62c9fc97efa412dd562.zip
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-log.c')
-rw-r--r--ui-log.c12
1 files changed, 6 insertions, 6 deletions
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)
82 goto next; 82 goto next;
83 strncpy(buf, deco->name + 13, sizeof(buf) - 1); 83 strncpy(buf, deco->name + 13, sizeof(buf) - 1);
84 cgit_log_link(buf, NULL, "remote-deco", NULL, 84 cgit_log_link(buf, NULL, "remote-deco", NULL,
85 sha1_to_hex(commit->object.sha1), 85 oid_to_hex(&commit->object.oid),
86 ctx.qry.vpath, 0, NULL, NULL, 86 ctx.qry.vpath, 0, NULL, NULL,
87 ctx.qry.showmsg, 0); 87 ctx.qry.showmsg, 0);
88 } 88 }
89 else { 89 else {
90 strncpy(buf, deco->name, sizeof(buf) - 1); 90 strncpy(buf, deco->name, sizeof(buf) - 1);
91 cgit_commit_link(buf, NULL, "deco", ctx.qry.head, 91 cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
92 sha1_to_hex(commit->object.sha1), 92 oid_to_hex(&commit->object.oid),
93 ctx.qry.vpath); 93 ctx.qry.vpath);
94 } 94 }
95next: 95next:
@@ -148,8 +148,8 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
148 rem_lines = 0; 148 rem_lines = 0;
149 149
150 DIFF_OPT_SET(&revs->diffopt, RECURSIVE); 150 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
151 diff_tree_sha1(parent->tree->object.sha1, 151 diff_tree_sha1(parent->tree->object.oid.hash,
152 commit->tree->object.sha1, 152 commit->tree->object.oid.hash,
153 "", &revs->diffopt); 153 "", &revs->diffopt);
154 diffcore_std(&revs->diffopt); 154 diffcore_std(&revs->diffopt);
155 155
@@ -233,7 +233,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
233 } 233 }
234 } 234 }
235 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, 235 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
236 sha1_to_hex(commit->object.sha1), ctx.qry.vpath); 236 oid_to_hex(&commit->object.oid), ctx.qry.vpath);
237 show_commit_decorations(commit); 237 show_commit_decorations(commit);
238 html("</td><td>"); 238 html("</td><td>");
239 cgit_open_filter(ctx.repo->email_filter, info->author_email, "log"); 239 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)
269 strbuf_addstr(&msgbuf, info->msg); 269 strbuf_addstr(&msgbuf, info->msg);
270 strbuf_addch(&msgbuf, '\n'); 270 strbuf_addch(&msgbuf, '\n');
271 } 271 }
272 format_display_notes(commit->object.sha1, 272 format_display_notes(commit->object.oid.hash,
273 &msgbuf, PAGE_ENCODING, 0); 273 &msgbuf, PAGE_ENCODING, 0);
274 strbuf_addch(&msgbuf, '\n'); 274 strbuf_addch(&msgbuf, '\n');
275 strbuf_ltrim(&msgbuf); 275 strbuf_ltrim(&msgbuf);