Merge branch 'ph/format-patch-no-color'

* ph/format-patch-no-color: format-patch: ignore ui.color
2011-09-14 21:43:57 -07:00
parent 1e5814f3de 787570c7cd
commit 559357b508
2 changed files with 10 additions and 1 deletions
--- a/builtin/log.c
+++ b/builtin/log.c
@ -608,7 +608,8 @@ static int git_format_config(const char *var, const char *value, void *cb)
 		string_list_append(&extra_cc, value);
 		return 0;
 	}
-	if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
+	if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") ||
+	    !strcmp(var, "color.ui")) {
 		return 0;
 	}
 	if (!strcmp(var, "format.numbered")) {