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>
这个提交包含在:
7
ui-log.c
7
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;
|
||||
|
||||
|
在新工单中引用
屏蔽一个用户