diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:19:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:19:16 -0700 |
| commit | f946b465d7fa13a235dd5653d37c7babb1ceb233 (patch) | |
| tree | d3a1aa2e6f0779e5440cec0815f0d59d9e31b4d4 /builtin/merge.c | |
| parent | e5cfcb04e0acc5f3b51e6d69487028315b33e4c9 (diff) | |
| parent | c9bfb953489e559d513c1627150aa16f8d42d6c5 (diff) | |
| download | git-f946b465d7fa13a235dd5653d37c7babb1ceb233.tar.gz git-f946b465d7fa13a235dd5653d37c7babb1ceb233.tar.xz | |
Merge branch 'jk/color-and-pager'
* jk/color-and-pager:
want_color: automatically fallback to color.ui
diff: don't load color config in plumbing
config: refactor get_colorbool function
color: delay auto-color decision until point of use
git_config_colorbool: refactor stdout_is_tty handling
diff: refactor COLOR_DIFF from a flag into an int
setup_pager: set GIT_PAGER_IN_USE
t7006: use test_config helpers
test-lib: add helper functions for config
t7006: modernize calls to unset
Conflicts:
builtin/commit.c
parse-options.c
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index f32c5c643..ab4077f27 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -390,8 +390,6 @@ static void finish(const unsigned char *new_head, const char *msg) opts.output_format |= DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT; opts.detect_rename = DIFF_DETECT_RENAME; - if (diff_use_color_default > 0) - DIFF_OPT_SET(&opts, COLOR_DIFF); if (diff_setup_done(&opts) < 0) die(_("diff_setup_done failed")); diff_tree_sha1(head, new_head, "", &opts); @@ -1033,10 +1031,6 @@ int cmd_merge(int argc, const char **argv, const char *prefix) git_config(git_merge_config, NULL); - /* for color.ui */ - if (diff_use_color_default == -1) - diff_use_color_default = git_use_color_default; - if (branch_mergeoptions) parse_branch_merge_options(branch_mergeoptions); argc = parse_options(argc, argv, prefix, builtin_merge_options, |