diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-10 02:14:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-10 02:14:18 -0700 |
| commit | 26c10c7ad39357bd94129c3949fed67c39302b0f (patch) | |
| tree | 88ffbda22c14a4fd3778623ee31afeb09915e71f /t | |
| parent | 94c27881bd98d5bb70e3d4f8a18e384095c876b9 (diff) | |
| parent | 392809702016cde59d50a7b07e8c27f6d0ec3c3f (diff) | |
| download | git-26c10c7ad39357bd94129c3949fed67c39302b0f.tar.gz git-26c10c7ad39357bd94129c3949fed67c39302b0f.tar.xz | |
Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maint
* jc/maint-hide-cr-in-diff-from-less:
diff: Help "less" hide ^M from the output
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4019-diff-wserror.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t4019-diff-wserror.sh b/t/t4019-diff-wserror.sh index 7eae1f450..84a1fe311 100755 --- a/t/t4019-diff-wserror.sh +++ b/t/t4019-diff-wserror.sh @@ -178,4 +178,16 @@ test_expect_success 'trailing empty lines (2)' ' ' +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 |