Skip to content

Commit

Permalink
t4015: work-around here document problem on Cygwin.
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <junio@twinsun.com>
  • Loading branch information
Junio C Hamano authored and Junio C Hamano committed Oct 13, 2006
1 parent 23bed43 commit 4035b46
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions t/t4015-diff-whitespace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ test_expect_success "Ray's example with -w" 'diff -u expect out'
git-diff -b > out
test_expect_success "Ray's example with -b" 'diff -u expect out'

cat << EOF > x
tr 'Q' '\015' << EOF > x
whitespace at beginning
whitespace change
whitespace in the middle
whitespace at end
unchanged line
CR at end
CR at endQ
EOF

git-update-index x
Expand All @@ -71,7 +71,7 @@ unchanged line
CR at end
EOF

cat << EOF > expect
tr 'Q' '\015' << EOF > expect
diff --git a/x b/x
index d99af23..8b32fb5 100644
--- a/x
Expand All @@ -86,7 +86,7 @@ index d99af23..8b32fb5 100644
+white space in the middle
+whitespace at end
unchanged line
-CR at end
-CR at endQ
+CR at end
EOF
git-diff > out
Expand All @@ -99,7 +99,7 @@ EOF
git-diff -w > out
test_expect_success 'another test, with -w' 'diff -u expect out'

cat << EOF > expect
tr 'Q' '\015' << EOF > expect
diff --git a/x b/x
index d99af23..8b32fb5 100644
--- a/x
Expand All @@ -113,7 +113,7 @@ index d99af23..8b32fb5 100644
+white space in the middle
+whitespace at end
unchanged line
-CR at end
-CR at endQ
+CR at end
EOF
git-diff -b > out
Expand Down

0 comments on commit 4035b46

Please sign in to comment.