diff options
| author |  Jeff King <peff@peff.net> | 2008-10-26 00:45:55 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-10-26 14:09:48 -0700 |
| commit | c7534ef4a12bb44806d522fc8e3961e390f9169b (patch) | |
| tree | 2183c3a803c4772c6d7c1b7ecdc6dcdd88785853 /builtin-diff.c | |
| parent | refactor userdiff textconv code (diff) | |
| download | tgif-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 'builtin-diff.c')
| -rw-r--r-- | builtin-diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index 9c8c295732..2de5834c11 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -300,6 +300,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) } DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL); DIFF_OPT_SET(&rev.diffopt, RECURSIVE); + DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV); /* * If the user asked for our exit code then don't start a |