summaryrefslogtreecommitdiff
path: root/t/t5515/refs.br-config-explicit-merge_config-explicit
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2008-10-26 00:45:55 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-10-26 14:09:48 -0700
commitc7534ef4a12bb44806d522fc8e3961e390f9169b (patch)
tree2183c3a803c4772c6d7c1b7ecdc6dcdd88785853 /t/t5515/refs.br-config-explicit-merge_config-explicit
parentrefactor userdiff textconv code (diff)
downloadtgif-c7534ef4a12bb44806d522fc8e3961e390f9169b.tar.xz
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>
Diffstat (limited to 't/t5515/refs.br-config-explicit-merge_config-explicit')
0 files changed, 0 insertions, 0 deletions