averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/maint-apply-tab-in-indent-fix' into HEAD

Browse Source 
* js/maint-apply-tab-in-indent-fix:
  apply --whitespace=fix: fix tab-in-indent
This commit is contained in:
Junio C Hamano
2010-12-01 14:42:00 -08:00
parent 7d43de925b d35711adc4
commit dee40e5178
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ws.c
View File

@@ -363,12 +363,13 @@ void ws_fix_copy(struct strbuf *dst, const char *src, int len, unsigned ws_rule,
fixed = 1;
} else if ((ws_rule & WS_TAB_IN_INDENT) && last_tab_in_indent >= 0) {
/* Expand tabs into spaces */
int start = dst->len;
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);
} while ((dst->len - start) % 8);
else
strbuf_addch(dst, src[i]);
}