Commit Diff

Commit:
10b394ac1c027dbd5663bfa1269707d1f8930f3e
From:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
regress: make merge.sh more POSIXy Don't use '==' for equality matching in sh, as this won't work across all shells. ok @naddy
Actions:
Patch | Tree
commit - 566e0ee7be3658e35381b86aee2469c0838c6985
commit + 10b394ac1c027dbd5663bfa1269707d1f8930f3e
blob - 7531c5533c9965ff12fa5f05ece3f43ddbe40b15
blob + e56a0bd381bdbeb93ee755f1e1279e9598388578
--- regress/cmdline/merge.sh
+++ regress/cmdline/merge.sh
@@ -56,7 +56,7 @@ test_merge_basic() {
 	(cd $testroot/wt && got merge newbranch \
 		> $testroot/stdout 2> $testroot/stderr)
 	ret="$?"
-	if [ "$ret" == "0" ]; then
+	if [ "$ret" = "0" ]; then
 		echo "got merge succeeded unexpectedly" >&2
 		test_done "$testroot" "1"
 		return 1
@@ -86,7 +86,7 @@ test_merge_basic() {
 	(cd $testroot/wt && got merge newbranch \
 		> $testroot/stdout 2> $testroot/stderr)
 	ret="$?"
-	if [ "$ret" == "0" ]; then
+	if [ "$ret" = "0" ]; then
 		echo "got merge succeeded unexpectedly" >&2
 		test_done "$testroot" "$ret"
 		return 1
@@ -121,7 +121,7 @@ test_merge_basic() {
 	(cd $testroot/wt && got merge newbranch \
 		> $testroot/stdout 2> $testroot/stderr)
 	ret="$?"
-	if [ "$ret" == "0" ]; then
+	if [ "$ret" = "0" ]; then
 		echo "got merge succeeded unexpectedly" >&2
 		test_done "$testroot" "$ret"
 		return 1
@@ -158,7 +158,7 @@ test_merge_basic() {
 	(cd $testroot/wt && got merge newbranch \
 		> $testroot/stdout 2> $testroot/stderr)
 	ret="$?"
-	if [ "$ret" == "0" ]; then
+	if [ "$ret" = "0" ]; then
 		echo "got merge succeeded unexpectedly" >&2
 		test_done "$testroot" "$ret"
 		return 1
@@ -183,7 +183,7 @@ test_merge_basic() {
 	(cd $testroot/wt && got merge newbranch \
 		> $testroot/stdout 2> $testroot/stderr)
 	ret="$?"
-	if [ "$ret" == "0" ]; then
+	if [ "$ret" = "0" ]; then
 		echo "got merge succeeded unexpectedly" >&2
 		test_done "$testroot" "$ret"
 		return 1
@@ -418,7 +418,7 @@ test_merge_continue() {
 	(cd $testroot/wt && got merge newbranch \
 		> $testroot/stdout 2> $testroot/stderr)
 	ret="$?"
-	if [ "$ret" == "0" ]; then
+	if [ "$ret" = "0" ]; then
 		echo "got merge succeeded unexpectedly" >&2
 		test_done "$testroot" "1"
 		return 1
@@ -643,7 +643,7 @@ test_merge_abort() {
 	(cd $testroot/wt && got merge newbranch \
 		> $testroot/stdout 2> $testroot/stderr)
 	ret="$?"
-	if [ "$ret" == "0" ]; then
+	if [ "$ret" = "0" ]; then
 		echo "got merge succeeded unexpectedly" >&2
 		test_done "$testroot" "1"
 		return 1
@@ -824,7 +824,7 @@ test_merge_in_progress() {
 	(cd $testroot/wt && got merge newbranch \
 		> $testroot/stdout 2> $testroot/stderr)
 	ret="$?"
-	if [ "$ret" == "0" ]; then
+	if [ "$ret" = "0" ]; then
 		echo "got merge succeeded unexpectedly" >&2
 		test_done "$testroot" "1"
 		return 1
@@ -928,7 +928,7 @@ test_merge_path_prefix() {
 	(cd $testroot/wt && got merge newbranch \
 		> $testroot/stdout 2> $testroot/stderr)
 	ret="$?"
-	if [ "$ret" == "0" ]; then
+	if [ "$ret" = "0" ]; then
 		echo "got merge succeeded unexpectedly" >&2
 		test_done "$testroot" "1"
 		return 1
@@ -982,7 +982,7 @@ test_merge_missing_file() {
 	(cd $testroot/wt && got merge newbranch \
 		> $testroot/stdout 2> $testroot/stderr)
 	ret="$?"
-	if [ "$ret" == "0" ]; then
+	if [ "$ret" = "0" ]; then
 		echo "got merge succeeded unexpectedly" >&2
 		test_done "$testroot" "1"
 		return 1
@@ -1065,7 +1065,7 @@ test_merge_no_op() {
 	(cd $testroot/wt && got merge newbranch \
 		> $testroot/stdout 2> $testroot/stderr)
 	ret="$?"
-	if [ "$ret" == "0" ]; then
+	if [ "$ret" = "0" ]; then
 		echo "got merge succeeded unexpectedly" >&2
 		test_done "$testroot" "1"
 		return 1
@@ -1114,7 +1114,7 @@ test_merge_no_op() {
 	(cd $testroot/wt && got merge -c > $testroot/stdout \
 		2> $testroot/stderr)
 	ret="$?"
-	if [ "$ret" == "0" ]; then
+	if [ "$ret" = "0" ]; then
 		echo "got merge succeeded unexpectedly" >&2
 		test_done "$testroot" "$ret"
 		return 1