kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 <chris@arachsys.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Chris Webb 2010-04-03 00:37:30 +01:00 committed by Junio C Hamano
parent d511bd330d
commit 4e35c51e51
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ws.c
View File

@ -360,6 +360,20 @@ void ws_fix_copy(struct strbuf *dst, const char *src, int len, unsigned ws_rule,
len -= last; len -= last;
src += last; src += last;
fixed = 1; 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); strbuf_add(dst, src, len);