зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
d511bd330d
Коммит
4e35c51e51
14
ws.c
14
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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче