summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorRyan Anderson <ryan@michonline.com>2006-07-09 06:28:21 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-09 07:48:16 (GMT)
commitf3aafa4db29c3d4799eeeda21efaf15d364ae59a (patch)
treedfa98d56824dd39202dc7011295269df90db4e69 /builtin-log.c
parent135a522e3f0ddc85664b3cd094918f095ac76d79 (diff)
downloadgit-f3aafa4db29c3d4799eeeda21efaf15d364ae59a.zip
git-f3aafa4db29c3d4799eeeda21efaf15d364ae59a.tar.gz
git-f3aafa4db29c3d4799eeeda21efaf15d364ae59a.tar.bz2
Disable color detection during format-patch
Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-log.c b/builtin-log.c
index 698b71e..0aeeaa4 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -105,6 +105,9 @@ static int git_format_config(const char *var, const char *value)
strcat(extra_headers, value);
return 0;
}
+ if (!strcmp(var, "diff.color")) {
+ return 0;
+ }
return git_diff_config(var, value);
}