userdiff: require explicitly allowing textconv
authorJeff King <peff@peff.net>
Sun, 26 Oct 2008 04:45:55 +0000 (00:45 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 26 Oct 2008 21:09:48 +0000 (14:09 -0700)
commitc7534ef4a12bb44806d522fc8e3961e390f9169b
tree2183c3a803c4772c6d7c1b7ecdc6dcdd88785853
parent04427ac8483f61dcb01a48c78a821f5042c88195
userdiff: require explicitly allowing textconv

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: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-diff.c
builtin-log.c
diff.c
diff.h
t/t4030-diff-textconv.sh
userdiff.c
userdiff.h