diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-18 15:50:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-18 15:50:16 -0800 |
| commit | e6cb314c087661a535b8873502b6d40cef1bbd57 (patch) | |
| tree | b097ca74690e1d6bf8a95b5162eb95ec931ad5ed /log-tree.c | |
| parent | 41d8a5f0f7db6e1d92f925234eb8c55d2d34a5af (diff) | |
| parent | d054680c7d245b71ebba0dd030fd13dce213559a (diff) | |
| download | git-e6cb314c087661a535b8873502b6d40cef1bbd57.tar.gz | |
Merge branch 'ph/diffopts'
* ph/diffopts:
Reorder diff_opt_parse options more logically per topics.
Make the diff_options bitfields be an unsigned with explicit masks.
Use OPT_BIT in builtin-pack-refs
Use OPT_BIT in builtin-for-each-ref
Use OPT_SET_INT and OPT_BIT in builtin-branch
parse-options new features.
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/log-tree.c b/log-tree.c index a34beb0b02..1f3fcf16ad 100644 --- a/log-tree.c +++ b/log-tree.c @@ -245,8 +245,7 @@ void show_log(struct rev_info *opt, const char *sep) opt->diffopt.stat_sep = buffer; } } else if (opt->commit_format != CMIT_FMT_USERFORMAT) { - fputs(diff_get_color(opt->diffopt.color_diff, DIFF_COMMIT), - stdout); + fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout); if (opt->commit_format != CMIT_FMT_ONELINE) fputs("commit ", stdout); if (commit->object.flags & BOUNDARY) @@ -266,8 +265,7 @@ void show_log(struct rev_info *opt, const char *sep) diff_unique_abbrev(parent->object.sha1, abbrev_commit)); show_decorations(commit); - printf("%s", - diff_get_color(opt->diffopt.color_diff, DIFF_RESET)); + printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET)); putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n'); if (opt->reflog_info) { show_reflog_message(opt->reflog_info, |