Skip to content

Commit 4035b46

Browse files
Junio C HamanoJunio C Hamano
authored andcommitted
t4015: work-around here document problem on Cygwin.
Signed-off-by: Junio C Hamano <junio@twinsun.com>
1 parent 23bed43 commit 4035b46

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/t4015-diff-whitespace.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ test_expect_success "Ray's example with -w" 'diff -u expect out'
5151
git-diff -b > out
5252
test_expect_success "Ray's example with -b" 'diff -u expect out'
5353

54-
cat << EOF > x
54+
tr 'Q' '\015' << EOF > x
5555
whitespace at beginning
5656
whitespace change
5757
whitespace in the middle
5858
whitespace at end
5959
unchanged line
60-
CR at end
60+
CR at endQ
6161
EOF
6262

6363
git-update-index x
@@ -71,7 +71,7 @@ unchanged line
7171
CR at end
7272
EOF
7373

74-
cat << EOF > expect
74+
tr 'Q' '\015' << EOF > expect
7575
diff --git a/x b/x
7676
index 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
9191
EOF
9292
git-diff > out
@@ -99,7 +99,7 @@ EOF
9999
git-diff -w > out
100100
test_expect_success 'another test, with -w' 'diff -u expect out'
101101

102-
cat << EOF > expect
102+
tr 'Q' '\015' << EOF > expect
103103
diff --git a/x b/x
104104
index 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
118118
EOF
119119
git-diff -b > out

0 commit comments

Comments
 (0)