X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4014-format-patch.sh;h=4795872a776e3ccc7cc904b12c0352aae782f502;hb=5fed4668153c9ca6e44ec84a0976089f515705aa;hp=c044044f8098bfda43a70dab31eb1e5ac53a94fa;hpb=ece3c67f9c8f0074cae76204a648cbfc6075bb44;p=git.git

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index c044044f8..4795872a7 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -21,15 +21,15 @@ test_expect_success setup '
 	for i in D E F; do echo "$i"; done >>file &&
 	git update-index file &&
 	git commit -m "Side change #2" &&
-	git tag C1 &&
+	git tag C2 &&
 
 	for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
 	git update-index file &&
 	git commit -m "Side change #3" &&
 
 	git checkout master &&
-	git diff-tree -p C1 | git apply --index &&
-	git commit -m "Master accepts moral equivalent of #1"
+	git diff-tree -p C2 | git apply --index &&
+	git commit -m "Master accepts moral equivalent of #2"
 
 '
 
@@ -37,7 +37,7 @@ test_expect_success "format-patch --ignore-if-in-upstream" '
 
 	git format-patch --stdout master..side >patch0 &&
 	cnt=`grep "^From " patch0 | wc -l` &&
-	test "$cnt" = 3
+	test $cnt = 3
 
 '
 
@@ -46,7 +46,7 @@ test_expect_success "format-patch --ignore-if-in-upstream" '
 	git format-patch --stdout \
 		--ignore-if-in-upstream master..side >patch1 &&
 	cnt=`grep "^From " patch1 | wc -l` &&
-	test "$cnt" = 2
+	test $cnt = 2
 
 '
 
@@ -55,7 +55,7 @@ test_expect_success "format-patch result applies" '
 	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" '
@@ -63,7 +63,7 @@ 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