Skip to content

Commit

Permalink
whitespace: add tab-in-indent support for --whitespace=fix
Browse files Browse the repository at this point in the history
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 <chris@arachsys.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Chris Webb authored and Junio C Hamano committed Apr 4, 2010
1 parent d511bd3 commit 4e35c51
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions ws.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 4e35c51

Please sign in to comment.