[PATCH 1/4] Fix "diff --check" whitespace detection
- From
Wincent Colaiuta <win@wincent.com>
- Date
- Dec 12, 2007, 16:22 UTC
- Message-ID
- <1197476582-18956-2-git-send-email-win@wincent.com>
- In-Reply-To
- <1197476582-18956-1-git-send-email-win@wincent.com>
"diff --check" would only detect spaces before tabs if a tab was the last character in the leading indent. Fix that and add a test case to make sure the bug doesn't regress in the future.
Signed-off-by: Wincent Colaiuta <win@wincent.com> ---
Although this patch is made to apply on top of the topic I posted earlier, it can be applied to master with a couple of tweaks. Let me know if you want me to send such a patch.
In any case, [2/4] and [3/4] factor away the code that had the bug in it anyway...
diff.c | 13 ++++++++++--- t/t4015-diff-whitespace.sh | 8 ++++++++ 2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c index e89c7ce..c9b3884 100644 --- a/diff.c +++ b/diff.c @@ -1010,11 +1010,18 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len) int i, spaces = 0, space_before_tab = 0, white_space_at_end = 0; /* check space before tab */ - for (i = 1; i < len && (line[i] == ' ' || line[i] == '\t'); i++) + for (i = 1; i < len; i++) { if (line[i] == ' ') spaces++; - if (line[i - 1] == '\t' && spaces) - space_before_tab = 1; + else if (line[i] == '\t') { + if (spaces) { + space_before_tab = 1; + break; + } + } + else + break; + } /* check whitespace at line end */ if (line[len - 1] == '\n') diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 5aaf2db..ff77a16 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -248,4 +248,12 @@ test_expect_failure 'check with space before tab in indent (diff-tree)' ' ' +# was a bug: space before tab only caught if tab was last in the indent +test_expect_failure 'check mixed spaces and tabs in indent' ' + + echo " foo();" > x && + git diff --check + +' + test_done
-- 1.5.3.7.1159.g2f071-dirty