diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-21 23:50:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-21 23:50:17 -0700 |
| commit | e16a4779b3213f5f734da38a414ec06882400742 (patch) | |
| tree | 9116d524bbdade1da8f61d5c2eed3212e9119514 /ws.c | |
| parent | c5764c095c2a563b657c1bd8f4a3e47bdeee14b0 (diff) | |
| parent | cff4231a1dfbe68b4a163b31406d862567d3243a (diff) | |
| download | git-e16a4779b3213f5f734da38a414ec06882400742.tar.gz git-e16a4779b3213f5f734da38a414ec06882400742.tar.xz | |
Sync with 1.6.3.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ws.c')
| -rw-r--r-- | ws.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -10,11 +10,12 @@ static struct whitespace_rule { const char *rule_name; unsigned rule_bits; + unsigned loosens_error; } whitespace_rule_names[] = { - { "trailing-space", WS_TRAILING_SPACE }, - { "space-before-tab", WS_SPACE_BEFORE_TAB }, - { "indent-with-non-tab", WS_INDENT_WITH_NON_TAB }, - { "cr-at-eol", WS_CR_AT_EOL }, + { "trailing-space", WS_TRAILING_SPACE, 0 }, + { "space-before-tab", WS_SPACE_BEFORE_TAB, 0 }, + { "indent-with-non-tab", WS_INDENT_WITH_NON_TAB, 0 }, + { "cr-at-eol", WS_CR_AT_EOL, 1 }, }; unsigned parse_whitespace_rule(const char *string) @@ -79,7 +80,8 @@ unsigned whitespace_rule(const char *pathname) unsigned all_rule = 0; int i; for (i = 0; i < ARRAY_SIZE(whitespace_rule_names); i++) - all_rule |= whitespace_rule_names[i].rule_bits; + if (!whitespace_rule_names[i].loosens_error) + all_rule |= whitespace_rule_names[i].rule_bits; return all_rule; } else if (ATTR_FALSE(value)) { /* false (-whitespace) */ |