8 files changed, 9 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 274f37e..8321ecc 100644
--- a/Makefile
+++ b/Makefile

@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.15.1
+GIT_VER = 2.16.0
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/cgit.c b/cgit.c
index 972a67e..a3702c2 100644
--- a/cgit.c
+++ b/cgit.c

@@ -478,7 +478,7 @@ static char *guess_defbranch(void)
        const char *ref, *refname;
        struct object_id oid;
-        ref = resolve_ref_unsafe("HEAD", 0, oid.hash, NULL);
+        ref = resolve_ref_unsafe("HEAD", 0, &oid, NULL);
        if (!ref || !skip_prefix(ref, "refs/heads/", &refname))
                return "master";
        return xstrdup(refname);
diff --git a/git b/git

-Subproject 9b185bef0c15cec1ea8753ce091e42ea041f2c3
+Subproject 2512f15446149235156528dafbe75930c712b29
diff --git a/shared.c b/shared.c
index df3f611..21ac8f4 100644
--- a/shared.c
+++ b/shared.c

@@ -346,7 +346,7 @@ void cgit_diff_tree(const struct object_id *old_oid,
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;
        opt.rename_limit = ctx.cfg.renamelimit;
-        DIFF_OPT_SET(&opt, RECURSIVE);
+        opt.flags.recursive = 1;
        if (ignorews)
                DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
        opt.format_callback = cgit_diff_tree_cb;
diff --git a/ui-blame.c b/ui-blame.c
index 62cf431..d4a4534 100644
--- a/ui-blame.c
+++ b/ui-blame.c

@@ -101,7 +101,7 @@ static void print_object(const unsigned char *sha1, const char *path,
        argv_array_push(&rev_argv, "blame");
        argv_array_push(&rev_argv, rev);
        init_revisions(&revs, NULL);
-        DIFF_OPT_SET(&revs.diffopt, ALLOW_TEXTCONV);
+        revs.diffopt.flags.allow_textconv = 1;
        setup_revisions(rev_argv.argc, rev_argv.argv, &revs, NULL);
        init_scoreboard(&sb);
        sb.revs = &revs;
diff --git a/ui-commit.c b/ui-commit.c
index 586fea0..abf58f6 100644
--- a/ui-commit.c
+++ b/ui-commit.c

@@ -41,7 +41,7 @@ void cgit_print_commit(char *hex, const char *prefix)
        format_display_notes(&oid, &notes, PAGE_ENCODING, 0);
-        load_ref_decorations(DECORATE_FULL_REFS);
+        load_ref_decorations(NULL, DECORATE_FULL_REFS);
        cgit_print_layout_start();
        cgit_print_diff_ctrls();
diff --git a/ui-diff.c b/ui-diff.c
index c7fb49b..a10ce8a 100644
--- a/ui-diff.c
+++ b/ui-diff.c

@@ -444,7 +444,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                diff_setup(&diffopt);
                diffopt.output_format = DIFF_FORMAT_PATCH;
-                DIFF_OPT_SET(&diffopt, RECURSIVE);
+                diffopt.flags.recursive = 1;
                diff_setup_done(&diffopt);
                ctx.page.mimetype = "text/plain";
diff --git a/ui-log.c b/ui-log.c
index 2d2bb31..8e36fba 100644
--- a/ui-log.c
+++ b/ui-log.c

@@ -119,8 +119,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
        struct commit_list *parents = commit->parents;
        struct commit *parent;
        int found = 0, saved_fmt;
-        unsigned saved_flags = revs->diffopt.flags;
+        struct diff_flags saved_flags = revs->diffopt.flags;
        /* Always show if we're not in "follow" mode with a single file. */
        if (!ctx.qry.follow)
@@ -149,7 +148,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
        add_lines = 0;
        rem_lines = 0;
-        DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
+        revs->diffopt.flags.recursive = 1;
        diff_tree_oid(&parent->tree->object.oid,
                      &commit->tree->object.oid,
                      "", &revs->diffopt);
@@ -434,7 +433,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        rev.ignore_missing = 1;
        rev.simplify_history = 1;
        setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
-        load_ref_decorations(DECORATE_FULL_REFS);
+        load_ref_decorations(NULL, DECORATE_FULL_REFS);
        rev.show_decorations = 1;
        rev.grep_filter.ignore_case = 1;

diff --git a/Makefile b/Makefile index 274f37e..8321ecc 100644 --- a/Makefile +++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
14	pdfdir = $(docdir)	14	pdfdir = $(docdir)
15	mandir = $(prefix)/share/man	15	mandir = $(prefix)/share/man
16	SHA1_HEADER = <openssl/sha.h>	16	SHA1_HEADER = <openssl/sha.h>
17	GIT_VER = 2.15.1	17	GIT_VER = 2.16.0
18	GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz	18	GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
19	INSTALL = install	19	INSTALL = install
20	COPYTREE = cp -r	20	COPYTREE = cp -r


diff --git a/cgit.c b/cgit.c index 972a67e..a3702c2 100644 --- a/cgit.c +++ b/cgit.c
@@ -478,7 +478,7 @@ static char *guess_defbranch(void)
478	const char ref, refname;	478	const char ref, refname;
479	struct object_id oid;	479	struct object_id oid;
480		480
481	ref = resolve_ref_unsafe("HEAD", 0, oid.hash, NULL);	481	ref = resolve_ref_unsafe("HEAD", 0, &oid, NULL);
482	if (!ref \|\| !skip_prefix(ref, "refs/heads/", &refname))	482	if (!ref \|\| !skip_prefix(ref, "refs/heads/", &refname))
483	return "master";	483	return "master";
484	return xstrdup(refname);	484	return xstrdup(refname);


diff --git a/git b/git
	Subproject 9b185bef0c15cec1ea8753ce091e42ea041f2c3		Subproject 2512f15446149235156528dafbe75930c712b29


diff --git a/shared.c b/shared.c index df3f611..21ac8f4 100644 --- a/shared.c +++ b/shared.c
@@ -346,7 +346,7 @@ void cgit_diff_tree(const struct object_id *old_oid,
346	opt.output_format = DIFF_FORMAT_CALLBACK;	346	opt.output_format = DIFF_FORMAT_CALLBACK;
347	opt.detect_rename = 1;	347	opt.detect_rename = 1;
348	opt.rename_limit = ctx.cfg.renamelimit;	348	opt.rename_limit = ctx.cfg.renamelimit;
349	DIFF_OPT_SET(&opt, RECURSIVE);	349	opt.flags.recursive = 1;
350	if (ignorews)	350	if (ignorews)
351	DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);	351	DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
352	opt.format_callback = cgit_diff_tree_cb;	352	opt.format_callback = cgit_diff_tree_cb;


diff --git a/ui-blame.c b/ui-blame.c index 62cf431..d4a4534 100644 --- a/ui-blame.c +++ b/ui-blame.c
@@ -101,7 +101,7 @@ static void print_object(const unsigned char sha1, const char path,
101	argv_array_push(&rev_argv, "blame");	101	argv_array_push(&rev_argv, "blame");
102	argv_array_push(&rev_argv, rev);	102	argv_array_push(&rev_argv, rev);
103	init_revisions(&revs, NULL);	103	init_revisions(&revs, NULL);
104	DIFF_OPT_SET(&revs.diffopt, ALLOW_TEXTCONV);	104	revs.diffopt.flags.allow_textconv = 1;
105	setup_revisions(rev_argv.argc, rev_argv.argv, &revs, NULL);	105	setup_revisions(rev_argv.argc, rev_argv.argv, &revs, NULL);
106	init_scoreboard(&sb);	106	init_scoreboard(&sb);
107	sb.revs = &revs;	107	sb.revs = &revs;


diff --git a/ui-commit.c b/ui-commit.c index 586fea0..abf58f6 100644 --- a/ui-commit.c +++ b/ui-commit.c
@@ -41,7 +41,7 @@ void cgit_print_commit(char hex, const char prefix)
41		41
42	format_display_notes(&oid, &notes, PAGE_ENCODING, 0);	42	format_display_notes(&oid, &notes, PAGE_ENCODING, 0);
43		43
44	load_ref_decorations(DECORATE_FULL_REFS);	44	load_ref_decorations(NULL, DECORATE_FULL_REFS);
45		45
46	cgit_print_layout_start();	46	cgit_print_layout_start();
47	cgit_print_diff_ctrls();	47	cgit_print_diff_ctrls();


diff --git a/ui-diff.c b/ui-diff.c index c7fb49b..a10ce8a 100644 --- a/ui-diff.c +++ b/ui-diff.c
@@ -444,7 +444,7 @@ void cgit_print_diff(const char new_rev, const char old_rev,
444		444
445	diff_setup(&diffopt);	445	diff_setup(&diffopt);
446	diffopt.output_format = DIFF_FORMAT_PATCH;	446	diffopt.output_format = DIFF_FORMAT_PATCH;
447	DIFF_OPT_SET(&diffopt, RECURSIVE);	447	diffopt.flags.recursive = 1;
448	diff_setup_done(&diffopt);	448	diff_setup_done(&diffopt);
449		449
450	ctx.page.mimetype = "text/plain";	450	ctx.page.mimetype = "text/plain";


diff --git a/ui-log.c b/ui-log.c index 2d2bb31..8e36fba 100644 --- a/ui-log.c +++ b/ui-log.c
@@ -119,8 +119,7 @@ static int show_commit(struct commit commit, struct rev_info revs)
119	struct commit_list *parents = commit->parents;	119	struct commit_list *parents = commit->parents;
120	struct commit *parent;	120	struct commit *parent;
121	int found = 0, saved_fmt;	121	int found = 0, saved_fmt;
122	unsigned saved_flags = revs->diffopt.flags;	122	struct diff_flags saved_flags = revs->diffopt.flags;
123
124		123
125	/* Always show if we're not in "follow" mode with a single file. */	124	/* Always show if we're not in "follow" mode with a single file. */
126	if (!ctx.qry.follow)	125	if (!ctx.qry.follow)
@@ -149,7 +148,7 @@ static int show_commit(struct commit commit, struct rev_info revs)
149	add_lines = 0;	148	add_lines = 0;
150	rem_lines = 0;	149	rem_lines = 0;
151		150
152	DIFF_OPT_SET(&revs->diffopt, RECURSIVE);	151	revs->diffopt.flags.recursive = 1;
153	diff_tree_oid(&parent->tree->object.oid,	152	diff_tree_oid(&parent->tree->object.oid,
154	&commit->tree->object.oid,	153	&commit->tree->object.oid,
155	"", &revs->diffopt);	154	"", &revs->diffopt);
@@ -434,7 +433,7 @@ void cgit_print_log(const char tip, int ofs, int cnt, char grep, char *pattern
434	rev.ignore_missing = 1;	433	rev.ignore_missing = 1;
435	rev.simplify_history = 1;	434	rev.simplify_history = 1;
436	setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);	435	setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
437	load_ref_decorations(DECORATE_FULL_REFS);	436	load_ref_decorations(NULL, DECORATE_FULL_REFS);
438	rev.show_decorations = 1;	437	rev.show_decorations = 1;
439	rev.grep_filter.ignore_case = 1;	438	rev.grep_filter.ignore_case = 1;
440		439