diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-25 01:29:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-25 01:29:20 -0700 |
| commit | 422a82f21370fe38b3e926a83b460bf2b1dd13ab (patch) | |
| tree | 744e121cdc79db2c8243555929e240aa170a187c /ws.c | |
| parent | 01ae841ccf3aa5d5331a4e6aed6122fee6617740 (diff) | |
Fix severe breakage in "git-apply --whitespace=fix"
735c674 (Trailing whitespace and no newline fix, 2009-07-22) completely broke --whitespace=fix, causing it to lose all the empty lines in a patch. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ws.c')
| -rw-r--r-- | ws.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ws.c b/ws.c index 8d855b7fd5..59d0883c1f 100644 --- a/ws.c +++ b/ws.c @@ -262,10 +262,10 @@ int ws_fix_copy(char *dst, const char *src, int len, unsigned ws_rule, int *erro * Strip trailing whitespace */ if (ws_rule & WS_TRAILING_SPACE) { - if (1 < len && src[len - 1] == '\n') { + if (0 < len && src[len - 1] == '\n') { add_nl_to_tail = 1; len--; - if (1 < len && src[len - 1] == '\r') { + if (0 < len && src[len - 1] == '\r') { add_cr_to_tail = !!(ws_rule & WS_CR_AT_EOL); len--; } |