2007-11-03 00:46:55 +00:00
|
|
|
#!/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 &&
|
2008-01-15 08:59:05 +00:00
|
|
|
echo "Carriage ReturnQ" | tr Q "\015" >>F &&
|
2008-08-12 05:15:28 +00:00
|
|
|
echo "No problem" >>F &&
|
|
|
|
echo >>F
|
2007-11-03 00:46:55 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
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 &&
|
2008-01-15 08:59:05 +00:00
|
|
|
grep Return error >/dev/null &&
|
2007-11-03 00:46:55 +00:00
|
|
|
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 &&
|
2008-01-15 08:59:05 +00:00
|
|
|
grep Return normal >/dev/null &&
|
2007-11-03 00:46:55 +00:00
|
|
|
grep No normal >/dev/null
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-12-06 08:14:14 +00:00
|
|
|
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 &&
|
2008-01-15 08:59:05 +00:00
|
|
|
grep Return normal >/dev/null &&
|
2007-12-06 08:14:14 +00:00
|
|
|
grep No normal >/dev/null
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-11-03 00:46:55 +00:00
|
|
|
test_expect_success 'without -space' '
|
|
|
|
|
2007-12-06 08:14:14 +00:00
|
|
|
rm -f .gitattributes
|
2007-11-03 00:46:55 +00:00
|
|
|
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 &&
|
2008-01-15 08:59:05 +00:00
|
|
|
grep Return error >/dev/null &&
|
2007-11-03 00:46:55 +00:00
|
|
|
grep No normal >/dev/null
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-12-06 08:14:14 +00:00
|
|
|
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 &&
|
2008-01-15 08:59:05 +00:00
|
|
|
grep Return error >/dev/null &&
|
2007-12-06 08:14:14 +00:00
|
|
|
grep No normal >/dev/null
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-11-03 00:46:55 +00:00
|
|
|
test_expect_success 'with indent-non-tab only' '
|
|
|
|
|
2007-12-06 08:14:14 +00:00
|
|
|
rm -f .gitattributes
|
2007-11-03 00:46:55 +00:00
|
|
|
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 &&
|
2008-01-15 08:59:05 +00:00
|
|
|
grep Return normal >/dev/null &&
|
2007-11-03 00:46:55 +00:00
|
|
|
grep No normal >/dev/null
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-12-06 08:14:14 +00:00
|
|
|
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 &&
|
2008-01-15 08:59:05 +00:00
|
|
|
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 &&
|
2007-12-06 08:14:14 +00:00
|
|
|
grep No normal >/dev/null
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-08-12 05:15:28 +00:00
|
|
|
test_expect_success 'trailing empty lines (1)' '
|
|
|
|
|
|
|
|
rm -f .gitattributes &&
|
|
|
|
test_must_fail git diff --check >output &&
|
2009-09-04 05:30:27 +00:00
|
|
|
grep "new blank line at" output &&
|
2008-08-12 05:15:28 +00:00
|
|
|
grep "trailing whitespace" output
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'trailing empty lines (2)' '
|
|
|
|
|
|
|
|
echo "F -whitespace" >.gitattributes &&
|
|
|
|
git diff --check >output &&
|
|
|
|
! test -s output
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-08-28 02:48:01 +00:00
|
|
|
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
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-11-03 00:46:55 +00:00
|
|
|
test_done
|