Skip to content
  • Jeff King's avatar
    add a "basic" diff config callback · 9a1805a8
    Jeff King authored and Junio C Hamano's avatar Junio C Hamano committed
    
    
    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: default avatarJeff King <peff@peff.net>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    9a1805a8