From 4e35c51e5113e83155a6c44a8f9adeafed9125d2 Mon Sep 17 00:00:00 2001 From: Chris Webb Date: Sat, 3 Apr 2010 00:37:30 +0100 Subject: [PATCH] whitespace: add tab-in-indent support for --whitespace=fix If tab-in-indent is set, --whitespace=fix will ensure that any stray tabs in the initial indent are expanded to the correct number of space characters. Signed-off-by: Chris Webb Signed-off-by: Junio C Hamano --- ws.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ws.c b/ws.c index 897ff56a5..d7b8c33f1 100644 --- a/ws.c +++ b/ws.c @@ -360,6 +360,20 @@ void ws_fix_copy(struct strbuf *dst, const char *src, int len, unsigned ws_rule, len -= last; src += last; fixed = 1; + } else if ((ws_rule & WS_TAB_IN_INDENT) && last_tab_in_indent >= 0) { + /* Expand tabs into spaces */ + int last = last_tab_in_indent + 1; + for (i = 0; i < last; i++) { + if (src[i] == '\t') + do { + strbuf_addch(dst, ' '); + } while (dst->len % 8); + else + strbuf_addch(dst, src[i]); + } + len -= last; + src += last; + fixed = 1; } strbuf_add(dst, src, len); -- 2.30.2