Andrew insists --whitespace=warn should be the default, and I tend to agree. This introduces --whitespace=warn, so if your project policy is more lenient, you can squelch them by having apply.whitespace=nowarn in your configuration file. Signed-off-by: Junio C Hamano <junkio@cox.net> --- * Not in "next" but will be shortly. apply.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) 114b085dd7b82c3ca74760c896e86c425127cf76 diff --git a/apply.c b/apply.c index a5cdd8e..d5cb5b1 100644 --- a/apply.c +++ b/apply.c @@ -39,7 +39,7 @@ static enum whitespace_eol { warn_on_whitespace, error_on_whitespace, strip_whitespace, -} new_whitespace = nowarn_whitespace; +} new_whitespace = warn_on_whitespace; static int whitespace_error = 0; static int squelch_whitespace_errors = 5; static int applied_after_stripping = 0; @@ -55,6 +55,10 @@ static void parse_whitespace_option(cons new_whitespace = warn_on_whitespace; return; } + if (!strcmp(option, "nowarn")) { + new_whitespace = nowarn_whitespace; + return; + } if (!strcmp(option, "error")) { new_whitespace = error_on_whitespace; return; -- 1.2.3.gbfea - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Tue Feb 28 12:15:24 2006
This archive was generated by hypermail 2.1.8 : 2006-02-28 12:16:08 EST