development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-apply --whitespace=nowarn

Browse source 
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>
This commit is contained in:
Junio C Hamano 2006-02-27 17:07:16 -08:00
parent 2ae1c53b51
commit 621603b76a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apply.c
View file

@ -39,7 +39,7 @@ static enum whitespace_eol {
warn_on_whitespace, warn_on_whitespace,
error_on_whitespace, error_on_whitespace,
strip_whitespace, strip_whitespace,
} new_whitespace = nowarn_whitespace; } new_whitespace = warn_on_whitespace;
static int whitespace_error = 0; static int whitespace_error = 0;
static int squelch_whitespace_errors = 5; static int squelch_whitespace_errors = 5;
static int applied_after_stripping = 0; static int applied_after_stripping = 0;
@ -48,13 +48,17 @@ static const char *patch_input_file = NULL;
static void parse_whitespace_option(const char *option) static void parse_whitespace_option(const char *option)
{ {
if (!option) { if (!option) {
new_whitespace = nowarn_whitespace; new_whitespace = warn_on_whitespace;
return; return;
} }
if (!strcmp(option, "warn")) { if (!strcmp(option, "warn")) {
new_whitespace = warn_on_whitespace; new_whitespace = warn_on_whitespace;
return; return;
} }
if (!strcmp(option, "nowarn")) {
new_whitespace = nowarn_whitespace;
return;
}
if (!strcmp(option, "error")) { if (!strcmp(option, "error")) {
new_whitespace = error_on_whitespace; new_whitespace = error_on_whitespace;
return; return;