Commit Diff

Commit:
2185070209cdb8294a76bf6bc8695326dd4701fc
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
set `ret' in a few places where it was forgotten; ok tracey@
Actions:
Patch | Tree
commit - 4e2bdb0dade94492580e4fbce20d9717bccc4e61
commit + 2185070209cdb8294a76bf6bc8695326dd4701fc
blob - 974b1ee37e1bd1153be6a955e7832d37f32e648f
blob + 994f2f0b851c88abfd6ed1e8047b65d044feab1b
--- regress/cmdline/cherrypick.sh
+++ regress/cmdline/cherrypick.sh
@@ -910,6 +910,7 @@ test_cherrypick_symlink_conflicts() {
 	echo "M  new.link" >> $testroot/stdout.expected
 	echo "D  nonexistent.link" >> $testroot/stdout.expected
 	(cd $testroot/wt && got status > $testroot/stdout)
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		diff -u $testroot/stdout.expected $testroot/stdout
 		test_done "$testroot" "$ret"
blob - 7a0c9fac946246753a140a7bcc326eb9d7dd52a0
blob + e6353f27abeab6054ae8674a3d2ea650d2a2c905
--- regress/cmdline/clone.sh
+++ regress/cmdline/clone.sh
@@ -30,12 +30,14 @@ test_clone_basic() {
 	fi
 
 	got log -l0 -p -r $testroot/repo > $testroot/log-repo
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got log command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
 		return 1
 	fi
 	got log -l0 -p -r $testroot/repo > $testroot/log-repo-clone
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got log command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -50,6 +52,7 @@ test_clone_basic() {
 	fi
 
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -68,6 +71,7 @@ test_clone_basic() {
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
blob - a47da6f0af1aa406f84e1d46e3d290ad42d50012
blob + 8d6881ec92c2a3aff5b101a606dfd3264744dcca
--- regress/cmdline/fetch.sh
+++ regress/cmdline/fetch.sh
@@ -34,6 +34,7 @@ test_fetch_basic() {
 	local commit_id2=`git_show_head $testroot/repo`
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -60,12 +61,14 @@ test_fetch_basic() {
 	fi
 
 	got log -l0 -p -r $testroot/repo > $testroot/log-repo
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got log command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
 		return 1
 	fi
 	got log -l0 -p -r $testroot/repo > $testroot/log-repo-clone
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got log command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -80,6 +83,7 @@ test_fetch_basic() {
 	fi
 
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -98,6 +102,7 @@ test_fetch_basic() {
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1200,6 +1205,7 @@ test_fetch_delete_remote_refs() {
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1262,6 +1268,7 @@ test_fetch_delete_remote_refs() {
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
blob - 5b7231fd5e9a81e444ef0abfde043e2d565cc61b
blob + 6125dc59b54701f50aa1248b7a9260c6ee5e9dca
--- regress/cmdline/send.sh
+++ regress/cmdline/send.sh
@@ -65,6 +65,7 @@ EOF
 	fi
 
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -86,6 +87,7 @@ EOF
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -267,6 +269,7 @@ EOF
 	fi
 
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -287,6 +290,7 @@ EOF
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -343,6 +347,7 @@ EOF
 	got branch -r $testroot/repo-clone branch2
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -447,8 +452,9 @@ EOF
 		test_done "$testroot" "$ret"
 		return 1
 	fi
-	
+
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -468,6 +474,7 @@ EOF
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -534,6 +541,7 @@ test_send_clone_and_send() {
 	fi
 
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -552,6 +560,7 @@ test_send_clone_and_send() {
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -631,6 +640,7 @@ EOF
 	fi
 
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -653,6 +663,7 @@ EOF
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -890,6 +901,7 @@ EOF
 	fi
 
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -915,6 +927,7 @@ EOF
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -992,6 +1005,7 @@ test_send_new_branch() {
 	fi
 
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1011,6 +1025,7 @@ test_send_new_branch() {
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1077,6 +1092,7 @@ test_send_all_branches() {
 	local commit_id4=`git_show_branch_head $testroot/repo-clone bar`
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1125,6 +1141,7 @@ test_send_all_branches() {
 	fi
 
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1145,6 +1162,7 @@ test_send_all_branches() {
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1226,6 +1244,7 @@ EOF
 	got ref -r $testroot/repo2 -s refs/heads/master HEAD
 
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1246,6 +1265,7 @@ EOF
 	fi
 
 	got ref -l -r $testroot/repo2 > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1321,6 +1341,7 @@ remote "origin" {
 }
 EOF
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1348,6 +1369,7 @@ EOF
 	fi
 
 	got ref -l -r $testroot/repo > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1378,8 +1400,9 @@ EOF
 		test_done "$testroot" "$ret"
 		return 1
 	fi
-	
+
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1429,6 +1452,7 @@ remote "origin" {
 }
 EOF
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
@@ -1461,6 +1485,7 @@ EOF
 	fi
 
 	got ref -l -r $testroot/repo-clone > $testroot/stdout
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		echo "got ref command failed unexpectedly" >&2
 		test_done "$testroot" "$ret"
blob - 8e9460b1c61f50069bd6623a7b8e745483394e07
blob + df937849c6b990bff03f3bfe1953cc9376da9a30
--- regress/cmdline/update.sh
+++ regress/cmdline/update.sh
@@ -2263,6 +2263,7 @@ test_update_symlink_conflicts() {
 	echo "M  new.link" >> $testroot/stdout.expected
 	echo "D  nonexistent.link" >> $testroot/stdout.expected
 	(cd $testroot/wt && got status > $testroot/stdout)
+	ret=$?
 	if [ $ret -ne 0 ]; then
 		diff -u $testroot/stdout.expected $testroot/stdout
 		test_done "$testroot" "$ret"