X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4015-diff-whitespace.sh;h=930e209d3136c855c3257e81d889e4dcf765595a;hb=12d6697f3a9f07db0c437438804aec994fc34035;hp=1bc5b7a41295426dfdd0b75aaf7b2ec4226f257a;hpb=58a1e0e83bcdbf063fb708ee9a8a563c0aa14f87;p=git.git diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 1bc5b7a41..930e209d3 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -43,13 +43,13 @@ index adf3937..6edc172 100644 EOF git-diff > out -test_expect_success "Ray's example without options" 'diff -u expect out' +test_expect_success "Ray's example without options" 'git diff expect out' git-diff -w > out -test_expect_success "Ray's example with -w" 'diff -u expect out' +test_expect_success "Ray's example with -w" 'git diff expect out' git-diff -b > out -test_expect_success "Ray's example with -b" 'diff -u expect out' +test_expect_success "Ray's example with -b" 'git diff expect out' tr 'Q' '\015' << EOF > x whitespace at beginning @@ -90,14 +90,14 @@ index d99af23..8b32fb5 100644 +CR at end EOF git-diff > out -test_expect_success 'another test, without options' 'diff -u expect out' +test_expect_success 'another test, without options' 'git diff expect out' cat << EOF > expect diff --git a/x b/x index d99af23..8b32fb5 100644 EOF git-diff -w > out -test_expect_success 'another test, with -w' 'diff -u expect out' +test_expect_success 'another test, with -w' 'git diff expect out' tr 'Q' '\015' << EOF > expect diff --git a/x b/x @@ -109,14 +109,12 @@ index d99af23..8b32fb5 100644 + whitespace at beginning whitespace change -whitespace in the middle --whitespace at end +white space in the middle -+whitespace at end + whitespace at end unchanged line --CR at endQ -+CR at end + CR at endQ EOF git-diff -b > out -test_expect_success 'another test, with -b' 'diff -u expect out' +test_expect_success 'another test, with -b' 'git diff expect out' test_done