@matheusbsbs / matheus-bagliano / commits / 4035b46e12
Fork 0

t4015: work-around here document problem on Cygwin.

Signed-off-by: Junio C Hamano <junio@twinsun.com>

Junio C Hamano committed Oct 13, 2006 at 14:20 UTC 4035b46e12ee6e5c9339e263cd16c2e2422b8928
1 file changed +6 -6
t/t4015-diff-whitespace.sh
+6 -6
@@ -51,13 +51,13 @@ test_expect_success "Ray's example with -w" 'diff -u expect out'
51 git-diff -b > out
52 test_expect_success "Ray's example with -b" 'diff -u expect out'
53
54 -cat << EOF > x
54 +tr 'Q' '\015' << EOF > x
55 whitespace at beginning
56 whitespace change
57 whitespace in the middle
58 whitespace at end
59 unchanged line
60 -CR at end
60 +CR at endQ
61 EOF
62
63 git-update-index x
@@ -71,7 +71,7 @@ unchanged line
71 CR at end
72 EOF
73
74 -cat << EOF > expect
74 +tr 'Q' '\015' << EOF > expect
75 diff --git a/x b/x
76 index d99af23..8b32fb5 100644
77 --- a/x
@@ -86,7 +86,7 @@ index d99af23..8b32fb5 100644
86 +white space in the middle
87 +whitespace at end
88 unchanged line
89 --CR at end
89 +-CR at endQ
90 +CR at end
91 EOF
92 git-diff > out
@@ -99,7 +99,7 @@ EOF
99 git-diff -w > out
100 test_expect_success 'another test, with -w' 'diff -u expect out'
101
102 -cat << EOF > expect
102 +tr 'Q' '\015' << EOF > expect
103 diff --git a/x b/x
104 index d99af23..8b32fb5 100644
105 --- a/x
@@ -113,7 +113,7 @@ index d99af23..8b32fb5 100644
113 +white space in the middle
114 +whitespace at end
115 unchanged line
116 --CR at end
116 +-CR at endQ
117 +CR at end
118 EOF
119 git-diff -b > out