From 11695a58fd732689be486edf88d145578a787c89 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
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.
---
 cgit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cgit.c')

diff --git a/cgit.c b/cgit.c
index 9427c4a..2f29aa6 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1026,7 +1026,7 @@ static int calc_ttl(void)
 	return ctx.cfg.cache_repo_ttl;
 }
 
-int main(int argc, const char **argv)
+int cmd_main(int argc, const char **argv)
 {
 	const char *path;
 	int err, ttl;
-- 
cgit 1.4.1-3-g733a5