From: Ryan Anderson <ryan@michonline.com>
Date: Sun, 9 Jul 2006 06:28:21 +0000 (-0400)
Subject: Disable color detection during format-patch
X-Git-Tag: v1.4.2-rc1~66
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f3aafa4;p=git.git

Disable color detection during format-patch

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-log.c b/builtin-log.c
index 698b71ecc..0aeeaa4e2 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);
 }