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

diff --git a/t/t1400-patch-history.sh b/t/t1400-patch-history.sh
index b182838..a693e75 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,24 +35,25 @@ 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"
 	'
 
 test_expect_success \
 	'Check the log annotation' \
 	'
-	stg log foo | grep -q -e "\[refresh\] foo notes "
-	stg log bar | grep -q -e "\[refresh\]           "
+	stg log foo | grep -q -e    "\[refresh\] foo notes  " &&
+	stg log bar | grep -q -e    "\[refresh\]            " &&
+	stg refresh -p foo --annotate="foo notes 2" &&
+	stg log foo | grep -q -v -e "\[refresh\] foo notes  " &&
+	stg log foo | grep -q -e    "\[refresh\] foo notes 2"
 	'
 
 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    "
 	'
@@ -61,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) "
 	'