undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply --whitespace=fix: fix tab-in-indent

Browse Source 
When the whitespace rule tab-in-indent is enabled, apply --whitespace=fix
replaces tabs by the appropriate amount of blanks. The code used
"dst->len % 8" as the criterion to stop adding blanks. But it forgot that
dst holds more than just the current line. Consequently, the modulus was
computed correctly only for the first added line, but not for the second
and subsequent lines. Fix it.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Acked-by: Chris Webb <chris@arachsys.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt 2010-11-30 09:22:04 +01:00 committed by Junio C Hamano
parent a347b17f15
commit d35711adc4
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
t/t4124-apply-ws-rule.sh
View File

@ -121,6 +121,34 @@ test_expect_success 'whitespace=error-all, no rule (attribute)' '
' '
test_expect_success 'spaces inserted by tab-in-indent' '
git config core.whitespace -trailing,-space,-indent,tab &&
rm -f .gitattributes &&
test_fix % &&
sed -e "s/_/ /g" -e "s/>/ /" <<-\EOF >expect &&
An_SP in an ordinary line>and a HT.
________A HT (%).
________A SP and a HT (@%).
_________A SP, a HT and a SP (@%).
_______Seven SP.
________Eight SP (#).
________Seven SP and a HT (@%).
________________Eight SP and a HT (@#%).
_________Seven SP, a HT and a SP (@%).
_________________Eight SP, a HT and a SP (@#%).
_______________Fifteen SP (#).
________________Fifteen SP and a HT (@#%).
________________Sixteen SP (#).
________________________Sixteen SP and a HT (@#%).
_____a__Five SP, a non WS, two SP.
A line with a (!) trailing SP_
A line with a (!) trailing HT>
EOF
test_cmp expect target
'
for t in - '' for t in - ''
do do
case "$t" in '') tt='!' ;; *) tt= ;; esac case "$t" in '') tt='!' ;; *) tt= ;; esac

3
ws.c
View File

@ -362,12 +362,13 @@ void ws_fix_copy(struct strbuf *dst, const char *src, int len, unsigned ws_rule,
fixed = 1; fixed = 1;
} else if ((ws_rule & WS_TAB_IN_INDENT) && last_tab_in_indent >= 0) { } else if ((ws_rule & WS_TAB_IN_INDENT) && last_tab_in_indent >= 0) {
/* Expand tabs into spaces */ /* Expand tabs into spaces */
int start = dst->len;
int last = last_tab_in_indent + 1; int last = last_tab_in_indent + 1;
for (i = 0; i < last; i++) { for (i = 0; i < last; i++) {
if (src[i] == '\t') if (src[i] == '\t')
do { do {
strbuf_addch(dst, ' '); strbuf_addch(dst, ' ');
} while (dst->len % 8); } while ((dst->len - start) % 8);
else else
strbuf_addch(dst, src[i]); strbuf_addch(dst, src[i]);
} }