aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.c
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2016-09-04 12:38:18 +0200
committerChristian Hesse <mail@eworm.de>2016-09-04 12:38:18 +0200
commit11695a58fd732689be486edf88d145578a787c89 (patch)
treeab397b8346d89a01ecc1d99350e81f1bd7cbe7a4 /cgit.c
parentff9893ac8192579a00dd4c73ddff18ab232099a6 (diff)
downloadcgit-11695a58fd732689be486edf88d145578a787c89.tar.gz
cgit-11695a58fd732689be486edf88d145578a787c89.tar.xz
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.
Diffstat (limited to 'cgit.c')
-rw-r--r--cgit.c2
1 files changed, 1 insertions, 1 deletions
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;