Log subprocess calls during performance testing

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

diff --git a/t/t1400-patch-history.sh b/t/t1400-patch-history.sh
index 879b1a5..13cd1e3 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' \
        '
-       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"
        '
 
@@ -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) "
        '