• Jeff King's avatar
    userdiff: require explicitly allowing textconv · c7534ef4
    Jeff King authored
    Diffs that have been produced with textconv almost certainly
    cannot be applied, so we want to be careful not to generate
    them in things like format-patch.
    This introduces a new diff options, ALLOW_TEXTCONV, which
    controls this behavior. It is off by default, but is
    explicitly turned on for the "log" family of commands, as
    well as the "diff" porcelain (but not diff-* plumbing).
    Because both text conversion and external diffing are
    controlled by these diff options, we can get rid of the
    "plumbing versus porcelain" distinction when reading the
    config. This was an attempt to control the same thing, but
    suffered from being too coarse-grained.
    Signed-off-by: default avatarJeff King <peff@peff.net>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
userdiff.c 4.25 KB