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 879b1a5a03bceb66d9d97b31f24bcbc5b313de49..13cd1e338e0cfc576288a7c04507a554bd06e5d8 100755 (executable)
--- a/t/t1400-patch-history.sh
+++ b/t/t1400-patch-history.sh
@@ -35,9 +35,7 @@ test_expect_success \
 test_expect_success \
        'Check the "new" and "refresh" logs' \
        '
 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 foo | grep -q -e "^refresh" &&

-       stg log --full | grep -q -e "^new" &&

        stg log --full | grep -q -e "^refresh"
        '
 
        stg log --full | grep -q -e "^refresh"
        '
 


@@ -84,7 +82,7 @@ test_expect_success \
        echo bar > test && stg refresh &&
        stg pop &&
        echo foo > test && stg refresh &&
        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) "
        '
 
        stg log --full | grep -q -e "^push(c) "
        '