X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/59c97ab4255eb651bc9bcc05c62bc45df3840e20..cb1570e14f5e021ccd6580f207fdc6297611fc49:/t/t1203-push-conflict.sh

diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh
index f9537d9..96fee15 100755
--- a/t/t1203-push-conflict.sh
+++ b/t/t1203-push-conflict.sh
@@ -21,7 +21,7 @@ test_expect_success \
 	stg new foo -m foo &&
 	echo foo > test &&
 	echo fie > test2 &&
-	stg add test test2 &&
+	git add test test2 &&
 	stg refresh &&
         stg pop
 	'
@@ -31,14 +31,14 @@ test_expect_success \
 	'
 	stg new bar -m bar &&
 	echo bar > test &&
-	stg add test &&
+	git add test &&
 	stg refresh
 	'
 
 test_expect_success \
 	'Push the first patch with conflict' \
 	'
-	! stg push foo
+	conflict_old stg push foo
 	'
 
 test_expect_success \
@@ -53,6 +53,12 @@ test_expect_success \
 	git diff --cached --stat | grep -q -e "^ test2 | *1 "
 	'
 
+test_expect_success \
+	'Check that pop will fail while there are unmerged conflicts' \
+	'
+	command_error stg pop
+	'
+
 test_expect_success \
 	'Resolve the conflict' \
 	'