about summary refs log tree commit diff
path: root/ui-blame.c
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2018-01-18 09:19:31 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2018-01-19 11:34:43 +0100
commit1dd53e3a2ffec730ec27ebe15b3d63e0b417a544 (patch)
treec86ffb13ce4b57b03f19b1e513c91417b357ee83 /ui-blame.c
parentgit: update to v2.15.1 (diff)
downloadcgit-pink-1dd53e3a2ffec730ec27ebe15b3d63e0b417a544.tar.gz
cgit-pink-1dd53e3a2ffec730ec27ebe15b3d63e0b417a544.zip
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>
Diffstat (limited to '')
-rw-r--r--ui-blame.c2
1 files changed, 1 insertions, 1 deletions
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;