diff options
| author | Jeff King <peff@peff.net> | 2011-08-17 22:05:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-19 15:51:38 -0700 |
| commit | c9bfb953489e559d513c1627150aa16f8d42d6c5 (patch) | |
| tree | 2c12de73bcf6ecdb5f2c28aff6cbb3aba91f182a /builtin/diff.c | |
| parent | 3e1dd17a8958cc5fe47a7ca01c9da8f6fae9cb0b (diff) | |
| download | git-c9bfb953489e559d513c1627150aa16f8d42d6c5.tar.gz | |
want_color: automatically fallback to color.ui
All of the "do we want color" flags default to -1 to
indicate that we don't have any color configured. This value
is handled in one of two ways:
1. In porcelain, we check early on whether the value is
still -1 after reading the config, and set it to the
value of color.ui (which defaults to 0).
2. In plumbing, it stays untouched as -1, and want_color
defaults it to off.
This works fine, but means that every porcelain has to check
and reassign its color flag. Now that want_color gives us a
place to put this check in a single spot, we can do that,
simplifying the calling code.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 69cd5eed78..1118689fb2 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -277,9 +277,6 @@ int cmd_diff(int argc, const char **argv, const char *prefix) gitmodules_config(); git_config(git_diff_ui_config, NULL); - if (diff_use_color_default == -1) - diff_use_color_default = git_use_color_default; - init_revisions(&rev, prefix); /* If this is a no-index diff, just run it and exit there. */ |