Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t4015: work-around here document problem on Cygwin.
author
Junio C Hamano
<junio@twinsun.com>
Fri, 13 Oct 2006 21:20:27 +0000
(14:20 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Fri, 13 Oct 2006 21:21:22 +0000
(14:21 -0700)
Signed-off-by: Junio C Hamano <junio@twinsun.com>
t/t4015-diff-whitespace.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
23bed43
)
diff --git
a/t/t4015-diff-whitespace.sh
b/t/t4015-diff-whitespace.sh
index c945085245b4d41405f18b22c447c004c36cf132..1bc5b7a41295426dfdd0b75aaf7b2ec4226f257a 100755
(executable)
--- 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'
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
whitespace at beginning
whitespace change
whitespace in the middle
whitespace at end
unchanged line
-CR at end
\r
+CR at end
Q
EOF
git-update-index x
EOF
git-update-index x
@@
-71,7
+71,7
@@
unchanged line
CR at end
EOF
CR at end
EOF
-
cat
<< EOF > expect
+
tr 'Q' '\015'
<< EOF > expect
diff --git a/x b/x
index d99af23..8b32fb5 100644
--- a/x
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
+white space in the middle
+whitespace at end
unchanged line
--CR at end
\r
+-CR at end
Q
+CR at end
EOF
git-diff > out
+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'
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
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
+white space in the middle
+whitespace at end
unchanged line
--CR at end
\r
+-CR at end
Q
+CR at end
EOF
git-diff -b > out
+CR at end
EOF
git-diff -b > out