1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-23 10:16:08 +02:00

builtin-apply: stronger indent-with-on-tab fixing

Fix any sequence of 8 spaces in initial indent, not just the case where
the 8 spaces are the first thing on the line.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
J. Bruce Fields 2007-12-16 12:58:02 -05:00 committed by Junio C Hamano
parent 95f9b92700
commit b90ced0f7d

View File

@ -1587,8 +1587,7 @@ static int apply_line(char *output, const char *patch, int plen,
} else if (ch == ' ') {
last_space_in_indent = i;
if ((ws_rule & WS_INDENT_WITH_NON_TAB) &&
last_tab_in_indent <= 0 &&
8 <= i)
8 <= i - last_tab_in_indent)
need_fix_leading_space = 1;
}
else