From: Junio C Hamano <junkio@cox.net>
Date: Fri, 7 Jul 2006 12:27:24 +0000 (-0700)
Subject: diff.c: --no-color to defeat diff.color configuration.
X-Git-Tag: v1.4.2-rc1~58^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fef88bb0134dfd47b4bd17e668bbb860588dcb39;p=git.git

diff.c: --no-color to defeat diff.color configuration.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/diff.c b/diff.c
index 4bea3066a..1bf1ed096 100644
--- a/diff.c
+++ b/diff.c
@@ -1625,6 +1625,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
 	}
 	else if (!strcmp(arg, "--color"))
 		options->color_diff = 1;
+	else if (!strcmp(arg, "--no-color"))
+		options->color_diff = 0;
 	else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
 		options->xdl_opts |= XDF_IGNORE_WHITESPACE;
 	else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))