From 11695a58fd732689be486edf88d145578a787c89 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Sun, 4 Sep 2016 12:38:18 +0200 Subject: git: update to v2.10.0 Upstream continues to replace unsigned char *sha1 with struct object_id old_oid. This makes the required changes. The git lib has its own main function now. Rename our main function to cmd_main, it is called from main then. --- ui-log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui-log.c') diff --git a/ui-log.c b/ui-log.c index c97b8e0..a31ff7c 100644 --- a/ui-log.c +++ b/ui-log.c @@ -49,7 +49,7 @@ static void inspect_files(struct diff_filepair *pair) files++; if (ctx.repo->enable_log_linecount) - cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, + cgit_diff_files(&pair->one->oid, &pair->two->oid, &old_size, &new_size, &binary, 0, ctx.qry.ignorews, count_lines); } -- cgit v1.2.3-56-ge451