all repos — cgit @ 1dd53e3a2ffec730ec27ebe15b3d63e0b417a544

a hyperfast web frontend for git written in c 

git: update to v2.16.0

Update to git version v2.16.0:

* refs: convert resolve_ref_unsafe to struct object_id
  (49e61479be913f67e66bb3fdf8de9475c41b58bd)
* diff: remove DIFF_OPT_SET macro
  (23dcf77f48feb49c54bad09210f093a799816334)
* log: add option to choose which refs to decorate
  (65516f586b69307f977cd67cc45513a296cabc25)
* diff: convert flags to be stored in bitfields
  (02f2f56bc377c287c411947d0e1482aac888f8db)

Signed-off-by: Christian Hesse <mail@eworm.de>
Christian Hesse mail@eworm.de
Thu, 18 Jan 2018 09:19:31 +0100
commit

1dd53e3a2ffec730ec27ebe15b3d63e0b417a544

parent

5d947ba3f06ec2c7200aab8c22170e7f2bf55a7c

7 files changed, 9 insertions(+), 10 deletions(-)

jump to
M Makefile → 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
M cgit.c → cgit.c 
@@ -478,7 +478,7 @@ {
 	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);
M shared.c → shared.c 
@@ -346,7 +346,7 @@ diff_setup(&opt);
 	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;
M ui-blame.c → ui-blame.c 
@@ -101,7 +101,7 @@
 	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;
M ui-commit.c → ui-commit.c 
@@ -41,7 +41,7 @@ info = cgit_parse_commit(commit);
 
 	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();
M ui-diff.c → ui-diff.c 
@@ -444,7 +444,7 @@ struct diff_options diffopt;
 
 		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";
M ui-log.c → ui-log.c 
@@ -119,8 +119,7 @@ {
 	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 @@ files = 0;
 	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 @@ rev.show_root_diff = 0;
 	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;