summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2007-12-16 16:31:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-16 21:07:14 (GMT)
commit4d9697c7871e513712eb9cfd30611049b10e5132 (patch)
tree6b2e7cde4d716e45447e240946a55fbb0d67b94c
parentd7e522cffb2224b91c9c0edde093fbb81a0289b0 (diff)
downloadgit-4d9697c7871e513712eb9cfd30611049b10e5132.zip
git-4d9697c7871e513712eb9cfd30611049b10e5132.tar.gz
git-4d9697c7871e513712eb9cfd30611049b10e5132.tar.bz2
whitespace: fix off-by-one error in non-space-in-indent checking
If there were no tabs, and the last space was at position 7, then positions 0..7 had spaces, so there were 8 spaces. Update test to check exactly this case. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4015-diff-whitespace.sh4
-rw-r--r--ws.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 9bff8f5..0f16bca 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -298,7 +298,7 @@ test_expect_success 'check space before tab in indent (space-before-tab: on)' '
test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' '
git config core.whitespace "-indent-with-non-tab"
- echo " foo ();" > x &&
+ echo " foo ();" > x &&
git diff --check
'
@@ -306,7 +306,7 @@ test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' '
test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' '
git config core.whitespace "indent-with-non-tab" &&
- echo " foo ();" > x &&
+ echo " foo ();" > x &&
! git diff --check
'
diff --git a/ws.c b/ws.c
index 46cbdd6..5ebd109 100644
--- a/ws.c
+++ b/ws.c
@@ -159,7 +159,7 @@ unsigned check_and_emit_line(const char *line, int len, unsigned ws_rule,
}
/* Check for indent using non-tab. */
- if ((ws_rule & WS_INDENT_WITH_NON_TAB) && leading_space >= 8)
+ if ((ws_rule & WS_INDENT_WITH_NON_TAB) && leading_space >= 7)
result |= WS_INDENT_WITH_NON_TAB;
if (stream) {