Test operations on hidden patches

[stgit] / t / t1400-patch-history.sh

diff --git a/t/t1400-patch-history.sh b/t/t1400-patch-history.sh
index 5b842d0b116246398a29d4766d4185c3ed98a63c..13cd1e338e0cfc576288a7c04507a554bd06e5d8 100755 (executable)
--- 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) "
        '