Code

add a "basic" diff config callback
authorJeff King <peff@peff.net>
Fri, 4 Jan 2008 08:59:34 +0000 (03:59 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sat, 5 Jan 2008 00:05:23 +0000 (16:05 -0800)
commit9a1805a8726ee41f25be2e0f2d5f38f1150d38e4
tree8c7689216c4a0814ee7d3e97213be71bff8a937a
parent061d6b9a7bfcf88ff3895aa1be8424ae1647cbca
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>
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c
diff.c
diff.h