From b90ced0f7da0b8dcdac1aabd8840a23daef25b43 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Sun, 16 Dec 2007 12:58:02 -0500 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- builtin-apply.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin-apply.c b/builtin-apply.c index bd94a4bdb..5e3b4a144 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -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 -- 2.30.2