path: root/builtin-log.c
diff options
authorJeff King <>2008-10-26 04:45:55 (GMT)
committerJunio C Hamano <>2008-10-26 21:09:48 (GMT)
commitc7534ef4a12bb44806d522fc8e3961e390f9169b (patch)
tree2183c3a803c4772c6d7c1b7ecdc6dcdd88785853 /builtin-log.c
parent04427ac8483f61dcb01a48c78a821f5042c88195 (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin-log.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-log.c b/builtin-log.c
index a0944f7..75d698f 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -59,6 +59,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
} else
die("unrecognized argument: %s", arg);
+ DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV);