Track the files conflict history

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

diff --git a/t/t1400-patch-history.sh b/t/t1400-patch-history.sh
index cabd5e8bc9a2fb309b32d4956bf19fd2dc48538a..34162f42618944e1f62625230d4e5640d9b6845d 100755 (executable)
--- a/t/t1400-patch-history.sh
+++ b/t/t1400-patch-history.sh
@@ -68,9 +68,20 @@ test_expect_success \
        stg log | grep -q -e "^push(m)  "
        '
 
+test_expect_success \
+       'Check the "push(c)" log' \
+       '
+       echo bar > test && stg refresh &&
+       stg pop &&
+       echo foo > test && stg refresh &&
+       ! stg push &&
+       stg log | grep -q -e "^push(c)  "
+       '
+
 test_expect_success \
        'Check the push "undo" log' \
        '
+       stg status --reset &&
        stg push --undo &&
        stg log bar | grep -q -e "^undo "
        '