Fix error in status.py when calling git.resolved

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

diff --git a/t/t1400-patch-history.sh b/t/t1400-patch-history.sh
index b0602ff159ec4ff0c712ef9573b6e182428c6ebd..a693e75119ab671a186cf205f74aa60bc2a26000 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 new foo -m "Foo Patch" &&
        echo foo > test && echo foo2 >> test &&

-       stg add test &&
+       git add test &&

        stg refresh --annotate="foo notes"
        '
 
        stg refresh --annotate="foo notes"
        '
 


@@ -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"
        '
 


@@ -55,7 +53,7 @@ test_expect_success \
        'Check the "push" log' \
        '
        stg pop &&
        '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    "
        '
        stg push &&
        stg log --full | grep -q -e "^push    "
        '


@@ -64,7 +62,7 @@ test_expect_success \
        'Check the "push(f)" log' \
        '
        stg pop &&
        '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) "
        '
        stg push &&
        stg log --full | grep -q -e "^push(f) "
        '