summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ece3c67)
raw | patch | inline | side by side (parent: ece3c67)
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
Tue, 27 Jun 2006 08:12:12 +0000 (10:12 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 27 Jun 2006 17:55:33 +0000 (10:55 -0700) |
Some "wc" insist on putting a TAB in front of the number.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
t/t4014-format-patch.sh | patch | blob | history |
index c044044f8098bfda43a70dab31eb1e5ac53a94fa..ac2fde773d954969f8c69d41119252493e44a1d4 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
git format-patch --stdout master..side >patch0 &&
cnt=`grep "^From " patch0 | wc -l` &&
- test "$cnt" = 3
+ test $cnt = 3
'
git format-patch --stdout \
--ignore-if-in-upstream master..side >patch1 &&
cnt=`grep "^From " patch1 | wc -l` &&
- test "$cnt" = 2
+ test $cnt = 2
'
git checkout -b rebuild-0 master &&
git am -3 patch0 &&
cnt=`git rev-list master.. | wc -l` &&
- test "$cnt" = 2
+ test $cnt = 2
'
test_expect_success "format-patch --ignore-if-in-upstream result applies" '
git checkout -b rebuild-1 master &&
git am -3 patch1 &&
cnt=`git rev-list master.. | wc -l` &&
- test "$cnt" = 2
+ test $cnt = 2
'
test_done