diff options
| author | Jeff King <peff@peff.net> | 2008-01-04 08:59:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-05 00:05:23 (GMT) |
| commit | 9a1805a8726ee41f25be2e0f2d5f38f1150d38e4 (patch) | |
| tree | 8c7689216c4a0814ee7d3e97213be71bff8a937a /builtin-diff-files.c | |
| parent | 061d6b9a7bfcf88ff3895aa1be8424ae1647cbca (diff) | |
| download | git-9a1805a8726ee41f25be2e0f2d5f38f1150d38e4.zip git-9a1805a8726ee41f25be2e0f2d5f38f1150d38e4.tar.gz git-9a1805a8726ee41f25be2e0f2d5f38f1150d38e4.tar.bz2 | |
add a "basic" diff config callback
The diff porcelain uses git_diff_ui_config to set
porcelain-ish config options, like automatically turning on
color. The plumbing specifically avoids calling this
function, since it doesn't want things like automatic color
or rename detection.
However, some diff options should be set for both plumbing
and porcelain. For example, one can still turn on color in
git-diff-files using the --color command line option. This
means we want the color config from color.diff.* (so that
once color is on, we use the user's preferred scheme), but
_not_ the color.diff variable.
We split the diff config into "ui" and "basic", where
"basic" is suitable for use by plumbing (so _most_ things
affecting the output should still go into the "ui" part).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-diff-files.c')
| -rw-r--r-- | builtin-diff-files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-diff-files.c b/builtin-diff-files.c index 9c04111..4abe3c2 100644 --- a/builtin-diff-files.c +++ b/builtin-diff-files.c @@ -21,7 +21,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) prefix = setup_git_directory_gently(&nongit); init_revisions(&rev, prefix); - git_config(git_default_config); /* no "diff" UI options */ + git_config(git_diff_basic_config); /* no "diff" UI options */ rev.abbrev = 0; if (!setup_diff_no_index(&rev, argc, argv, nongit, prefix)) |