File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed
Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -51,13 +51,13 @@ test_expect_success "Ray's example with -w" 'diff -u expect out'
5151git-diff -b > out
5252test_expect_success " Ray's example with -b" ' diff -u expect out'
5353
54- cat << EOF > x
54+ tr ' Q ' ' \015 ' << EOF > x
5555whitespace at beginning
5656whitespace change
5757whitespace in the middle
5858whitespace at end
5959unchanged line
60- CR at end
60+ CR at endQ
6161EOF
6262
6363git-update-index x
@@ -71,7 +71,7 @@ unchanged line
7171CR at end
7272EOF
7373
74- cat << EOF > expect
74+ tr ' Q ' ' \015 ' << EOF > expect
7575diff --git a/x b/x
7676index d99af23..8b32fb5 100644
7777--- a/x
@@ -86,7 +86,7 @@ index d99af23..8b32fb5 100644
8686+white space in the middle
8787+whitespace at end
8888 unchanged line
89- -CR at end
89+ -CR at endQ
9090+CR at end
9191EOF
9292git-diff > out
9999git-diff -w > out
100100test_expect_success ' another test, with -w' ' diff -u expect out'
101101
102- cat << EOF > expect
102+ tr ' Q ' ' \015 ' << EOF > expect
103103diff --git a/x b/x
104104index d99af23..8b32fb5 100644
105105--- a/x
@@ -113,7 +113,7 @@ index d99af23..8b32fb5 100644
113113+white space in the middle
114114+whitespace at end
115115 unchanged line
116- -CR at end
116+ -CR at endQ
117117+CR at end
118118EOF
119119git-diff -b > out
You can’t perform that action at this time.
0 commit comments