X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/ea7634bb704b06deebea815ead41b30ed8544866..a2f4fe7de51cb580ca587d155f01ad569edd36ae:/t/t1400-patch-history.sh

diff --git a/t/t1400-patch-history.sh b/t/t1400-patch-history.sh
index b0602ff..13cd1e3 100755
--- a/t/t1400-patch-history.sh
+++ b/t/t1400-patch-history.sh
@@ -20,7 +20,7 @@ test_expect_success \
 	'
 	stg new foo -m "Foo Patch" &&
 	echo foo > test && echo foo2 >> test &&
-	stg add test &&
+	git add test &&
 	stg refresh --annotate="foo notes"
 	'
 
@@ -35,9 +35,7 @@ test_expect_success \
 test_expect_success \
 	'Check the "new" and "refresh" logs' \
 	'
-	stg log --full foo | grep -q -e "^new" &&
 	stg log --full foo | grep -q -e "^refresh" &&
-	stg log --full | grep -q -e "^new" &&
 	stg log --full | grep -q -e "^refresh"
 	'
 
@@ -55,7 +53,7 @@ test_expect_success \
 	'Check the "push" log' \
 	'
 	stg pop &&
-	echo foo > test2 && stg add test2 && stg refresh &&
+	echo foo > test2 && git add test2 && stg refresh &&
 	stg push &&
 	stg log --full | grep -q -e "^push    "
 	'
@@ -64,7 +62,7 @@ test_expect_success \
 	'Check the "push(f)" log' \
 	'
 	stg pop &&
-	stg refresh -m "Foo2 Patch" &&
+	stg edit -m "Foo2 Patch" &&
 	stg push &&
 	stg log --full | grep -q -e "^push(f) "
 	'
@@ -84,7 +82,7 @@ test_expect_success \
 	echo bar > test && stg refresh &&
 	stg pop &&
 	echo foo > test && stg refresh &&
-	! stg push &&
+	conflict_old stg push &&
 	stg log --full | grep -q -e "^push(c) "
 	'