aboutsummaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-22 17:52:55 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-22 22:16:14 -0700
commitf1af60bdba465779df92090ed370988f202ff043 (patch)
treec601842acbc36c310701f6e3f00d79364e42da86 /combine-diff.c
parentd83c9af5c6a437ddaa9dd2747e83aee642501a44 (diff)
downloadgit-f1af60bdba465779df92090ed370988f202ff043.tar.gz
git-f1af60bdba465779df92090ed370988f202ff043.tar.xz
Support 'diff=pgm' attribute
This enhances the attributes mechanism so that external programs meant for existing GIT_EXTERNAL_DIFF interface can be specifed per path. To configure such a custom diff driver, first define a custom diff driver in the configuration: [diff "my-c-diff"] command = <<your command string comes here>> Then mark the paths that you want to use this custom driver using the attribute mechanism. *.c diff=my-c-diff The intent of this separation is that the attribute mechanism is used for specifying the type of the contents, while the configuration mechanism is used to define what needs to be done to that type of the contents, which would be specific to both platform and personal taste. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 3a9b32f6b..cff9c5dc4 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -943,6 +943,7 @@ void diff_tree_combined(const unsigned char *sha1,
diffopts = *opt;
diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
diffopts.recursive = 1;
+ diffopts.allow_external = 0;
show_log_first = !!rev->loginfo && !rev->no_commit_id;
needsep = 0;