summaryrefslogtreecommitdiff
path: root/t/t4015-diff-whitespace.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junio@twinsun.com>2006-10-13 21:20:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-13 21:21:22 (GMT)
commit4035b46e12ee6e5c9339e263cd16c2e2422b8928 (patch)
tree1a4db946c019ae2d11f236638fb07cb09253f748 /t/t4015-diff-whitespace.sh
parent23bed43d0c5190b6da89f3f34d8badcc1b3c304b (diff)
downloadgit-4035b46e12ee6e5c9339e263cd16c2e2422b8928.zip
git-4035b46e12ee6e5c9339e263cd16c2e2422b8928.tar.gz
git-4035b46e12ee6e5c9339e263cd16c2e2422b8928.tar.bz2
t4015: work-around here document problem on Cygwin.
Signed-off-by: Junio C Hamano <junio@twinsun.com>
Diffstat (limited to 't/t4015-diff-whitespace.sh')
-rwxr-xr-xt/t4015-diff-whitespace.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index c945085..1bc5b7a 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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