X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/ed60fdae02d9317475eb64328ec683e1148c3f7b..3ce5fec2ef4154369653a41eb7692aca25878298:/t/t1400-patch-history.sh?ds=sidebyside

diff --git a/t/t1400-patch-history.sh b/t/t1400-patch-history.sh
index 5b842d0..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    "
 	'
@@ -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) "
 	'