From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Sun, 16 Dec 2007 17:58:02 +0000 (-0500)
Subject: builtin-apply: stronger indent-with-on-tab fixing
X-Git-Tag: v1.5.4-rc1~32
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b90ced0f7da0b8dcdac1aabd8840a23daef25b43;p=git.git

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>
---

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