X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/53f76663a55fc98d43d283dbef2306aac880d771..022a3664de84fc5cb6b94abb7ae1f27276c88ccf:/t/t1202-push-undo.sh?ds=sidebyside

diff --git a/t/t1202-push-undo.sh b/t/t1202-push-undo.sh
index 335b554..79439de 100755
--- a/t/t1202-push-undo.sh
+++ b/t/t1202-push-undo.sh
@@ -3,10 +3,10 @@
 # Copyright (c) 2006 Catalin Marinas
 #
 
-test_description='Exercise push --undo with missing files.
+test_description='Exercise stg undo with push of missing files.
 
 Test the case where a patch fails to be pushed because it modifies a
-missing file. The "push --undo" command has to be able to revert it.
+missing file. The "stg undo" command has to be able to revert it.
 '
 
 . ./test-lib.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
 	'
 
@@ -40,16 +40,31 @@ test_expect_success \
 	stg pop --all
 	'
 
-test_expect_failure \
+test_expect_success \
 	'Push the second patch with conflict' \
 	'
-	stg push bar
+	conflict_old stg push bar
 	'
 
 test_expect_success \
 	'Undo the previous push' \
 	'
-	stg push --undo
+	stg undo --hard
+	'
+
+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 undo --hard
 	'
 
 test_done