mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
3928097020
When the tracked contents have CRLF line endings, colored diff output
shows "^M" at the end of output lines, which is distracting, even though
the pager we use by default ("less") knows to hide them.
The problem is that "less" hides a carriage-return only at the end of the
line, immediately before a line feed. The colored diff output does not
take this into account, and emits four element sequence for each line:
- force this color;
- the line up to but not including the terminating line feed;
- reset color
- line feed.
By including the carriage return at the end of the line in the second
item, we are breaking the smart our pager has in order not to show "^M".
This can be fixed by changing the sequence to:
- force this color;
- the line up to but not including the terminating end-of-line;
- reset color
- end-of-line.
where end-of-line is either a single linefeed or a CRLF pair. When the
output is not colored, "force this color" and "reset color" sequences are
both empty, so we won't have this problem with or without this patch.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
193 lines
4.3 KiB
Bash
Executable file
193 lines
4.3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='diff whitespace error detection'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
git config diff.color.whitespace "blue reverse" &&
|
|
>F &&
|
|
git add F &&
|
|
echo " Eight SP indent" >>F &&
|
|
echo " HT and SP indent" >>F &&
|
|
echo "With trailing SP " >>F &&
|
|
echo "Carriage ReturnQ" | tr Q "\015" >>F &&
|
|
echo "No problem" >>F &&
|
|
echo >>F
|
|
|
|
'
|
|
|
|
blue_grep='7;34m' ;# ESC [ 7 ; 3 4 m
|
|
|
|
test_expect_success default '
|
|
|
|
git diff --color >output
|
|
grep "$blue_grep" output >error
|
|
grep -v "$blue_grep" output >normal
|
|
|
|
grep Eight normal >/dev/null &&
|
|
grep HT error >/dev/null &&
|
|
grep With error >/dev/null &&
|
|
grep Return error >/dev/null &&
|
|
grep No normal >/dev/null
|
|
|
|
'
|
|
|
|
test_expect_success 'without -trail' '
|
|
|
|
git config core.whitespace -trail
|
|
git diff --color >output
|
|
grep "$blue_grep" output >error
|
|
grep -v "$blue_grep" output >normal
|
|
|
|
grep Eight normal >/dev/null &&
|
|
grep HT error >/dev/null &&
|
|
grep With normal >/dev/null &&
|
|
grep Return normal >/dev/null &&
|
|
grep No normal >/dev/null
|
|
|
|
'
|
|
|
|
test_expect_success 'without -trail (attribute)' '
|
|
|
|
git config --unset core.whitespace
|
|
echo "F whitespace=-trail" >.gitattributes
|
|
git diff --color >output
|
|
grep "$blue_grep" output >error
|
|
grep -v "$blue_grep" output >normal
|
|
|
|
grep Eight normal >/dev/null &&
|
|
grep HT error >/dev/null &&
|
|
grep With normal >/dev/null &&
|
|
grep Return normal >/dev/null &&
|
|
grep No normal >/dev/null
|
|
|
|
'
|
|
|
|
test_expect_success 'without -space' '
|
|
|
|
rm -f .gitattributes
|
|
git config core.whitespace -space
|
|
git diff --color >output
|
|
grep "$blue_grep" output >error
|
|
grep -v "$blue_grep" output >normal
|
|
|
|
grep Eight normal >/dev/null &&
|
|
grep HT normal >/dev/null &&
|
|
grep With error >/dev/null &&
|
|
grep Return error >/dev/null &&
|
|
grep No normal >/dev/null
|
|
|
|
'
|
|
|
|
test_expect_success 'without -space (attribute)' '
|
|
|
|
git config --unset core.whitespace
|
|
echo "F whitespace=-space" >.gitattributes
|
|
git diff --color >output
|
|
grep "$blue_grep" output >error
|
|
grep -v "$blue_grep" output >normal
|
|
|
|
grep Eight normal >/dev/null &&
|
|
grep HT normal >/dev/null &&
|
|
grep With error >/dev/null &&
|
|
grep Return error >/dev/null &&
|
|
grep No normal >/dev/null
|
|
|
|
'
|
|
|
|
test_expect_success 'with indent-non-tab only' '
|
|
|
|
rm -f .gitattributes
|
|
git config core.whitespace indent,-trailing,-space
|
|
git diff --color >output
|
|
grep "$blue_grep" output >error
|
|
grep -v "$blue_grep" output >normal
|
|
|
|
grep Eight error >/dev/null &&
|
|
grep HT normal >/dev/null &&
|
|
grep With normal >/dev/null &&
|
|
grep Return normal >/dev/null &&
|
|
grep No normal >/dev/null
|
|
|
|
'
|
|
|
|
test_expect_success 'with indent-non-tab only (attribute)' '
|
|
|
|
git config --unset core.whitespace
|
|
echo "F whitespace=indent,-trailing,-space" >.gitattributes
|
|
git diff --color >output
|
|
grep "$blue_grep" output >error
|
|
grep -v "$blue_grep" output >normal
|
|
|
|
grep Eight error >/dev/null &&
|
|
grep HT normal >/dev/null &&
|
|
grep With normal >/dev/null &&
|
|
grep Return normal >/dev/null &&
|
|
grep No normal >/dev/null
|
|
|
|
'
|
|
|
|
test_expect_success 'with cr-at-eol' '
|
|
|
|
rm -f .gitattributes
|
|
git config core.whitespace cr-at-eol
|
|
git diff --color >output
|
|
grep "$blue_grep" output >error
|
|
grep -v "$blue_grep" output >normal
|
|
|
|
grep Eight normal >/dev/null &&
|
|
grep HT error >/dev/null &&
|
|
grep With error >/dev/null &&
|
|
grep Return normal >/dev/null &&
|
|
grep No normal >/dev/null
|
|
|
|
'
|
|
|
|
test_expect_success 'with cr-at-eol (attribute)' '
|
|
|
|
git config --unset core.whitespace
|
|
echo "F whitespace=trailing,cr-at-eol" >.gitattributes
|
|
git diff --color >output
|
|
grep "$blue_grep" output >error
|
|
grep -v "$blue_grep" output >normal
|
|
|
|
grep Eight normal >/dev/null &&
|
|
grep HT error >/dev/null &&
|
|
grep With error >/dev/null &&
|
|
grep Return normal >/dev/null &&
|
|
grep No normal >/dev/null
|
|
|
|
'
|
|
|
|
test_expect_success 'trailing empty lines (1)' '
|
|
|
|
rm -f .gitattributes &&
|
|
test_must_fail git diff --check >output &&
|
|
grep "ends with blank lines." output &&
|
|
grep "trailing whitespace" output
|
|
|
|
'
|
|
|
|
test_expect_success 'trailing empty lines (2)' '
|
|
|
|
echo "F -whitespace" >.gitattributes &&
|
|
git diff --check >output &&
|
|
! test -s output
|
|
|
|
'
|
|
|
|
test_expect_success 'do not color trailing cr in context' '
|
|
git config --unset core.whitespace
|
|
rm -f .gitattributes &&
|
|
echo AAAQ | tr Q "\015" >G &&
|
|
git add G &&
|
|
echo BBBQ | tr Q "\015" >>G
|
|
git diff --color G | tr "\015" Q >output &&
|
|
grep "BBB.*${blue_grep}Q" output &&
|
|
grep "AAA.*\[mQ" output
|
|
|
|
'
|
|
|
|
test_done
|