summaryrefslogtreecommitdiff
path: root/userdiff.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-10-26 04:45:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-10-26 21:09:48 (GMT)
commitc7534ef4a12bb44806d522fc8e3961e390f9169b (patch)
tree2183c3a803c4772c6d7c1b7ecdc6dcdd88785853 /userdiff.h
parent04427ac8483f61dcb01a48c78a821f5042c88195 (diff)
downloadgit-c7534ef4a12bb44806d522fc8e3961e390f9169b.zip
git-c7534ef4a12bb44806d522fc8e3961e390f9169b.tar.gz
git-c7534ef4a12bb44806d522fc8e3961e390f9169b.tar.bz2
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 'userdiff.h')
-rw-r--r--userdiff.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/userdiff.h b/userdiff.h
index f29c18f..ba29457 100644
--- a/userdiff.h
+++ b/userdiff.h
@@ -14,8 +14,7 @@ struct userdiff_driver {
const char *textconv;
};
-int userdiff_config_basic(const char *k, const char *v);
-int userdiff_config_porcelain(const char *k, const char *v);
+int userdiff_config(const char *k, const char *v);
struct userdiff_driver *userdiff_find_by_name(const char *name);
struct userdiff_driver *userdiff_find_by_path(const char *path);