X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/5f594e90e9a0867e1b87ffb8b0a077152246b56c..33ff9cdd840cfe2780acc41d88d33c8c3bc2761e:/t/t1202-push-undo.sh

diff --git a/t/t1202-push-undo.sh b/t/t1202-push-undo.sh
index 039103a..544fe8d 100755
--- a/t/t1202-push-undo.sh
+++ b/t/t1202-push-undo.sh
@@ -21,7 +21,7 @@ test_expect_success \
 	'
 	stg new foo -m foo &&
 	echo foo > test &&
-	stg add test &&
+	git add test &&
 	stg refresh
 	'
 
@@ -30,7 +30,7 @@ test_expect_success \
 	'
 	stg new bar -m bar &&
 	echo bar > test &&
-	stg add test &&
+	git add test &&
 	stg refresh
 	'
 
@@ -43,7 +43,7 @@ test_expect_success \
 test_expect_success \
 	'Push the second patch with conflict' \
 	'
-	! stg push bar
+	conflict_old stg push bar
 	'
 
 test_expect_success \
@@ -52,4 +52,19 @@ test_expect_success \
 	stg push --undo
 	'
 
+test_expect_success \
+	'Check the push after undo fails as well' \
+	'
+	conflict_old stg push bar
+	'
+
+test_expect_success \
+	'Undo with disappeared newborn' \
+	'
+	touch newfile &&
+	git add newfile &&
+	rm newfile &&
+	stg push --undo
+	'
+
 test_done