Remove a newline from the e-mail template

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

diff --git a/t/t1400-patch-history.sh b/t/t1400-patch-history.sh
index cabd5e8bc9a2fb309b32d4956bf19fd2dc48538a..5b842d0b116246398a29d4766d4185c3ed98a63c 100755 (executable)
--- a/t/t1400-patch-history.sh
+++ b/t/t1400-patch-history.sh
@@ -21,7 +21,7 @@ test_expect_success \
        stg new foo -m "Foo Patch" &&
        echo foo > test && echo foo2 >> test &&
        stg add test &&
-       stg refresh
+       stg refresh --annotate="foo notes"
        '
 
 test_expect_success \
@@ -35,10 +35,20 @@ test_expect_success \
 test_expect_success \
        'Check the "new" and "refresh" logs' \
        '
-       stg log foo | grep -q -e "^new" &&
-       stg log foo | grep -q -e "^refresh" &&
-       stg log | grep -q -e "^new" &&
-       stg log | grep -q -e "^refresh"
+       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"
+       '
+
+test_expect_success \
+       'Check the log annotation' \
+       '
+       stg log foo | grep -q -e    "\[refresh\] foo notes  " &&
+       stg log bar | grep -q -e    "\[refresh\]            " &&
+       stg refresh -p foo --annotate="foo notes 2" &&
+       stg log foo | grep -q -v -e "\[refresh\] foo notes  " &&
+       stg log foo | grep -q -e    "\[refresh\] foo notes 2"
        '
 
 test_expect_success \
@@ -47,16 +57,16 @@ test_expect_success \
        stg pop &&
        echo foo > test2 && stg add test2 && stg refresh &&
        stg push &&
-       stg log | grep -q -e "^push     "
+       stg log --full | grep -q -e "^push    "
        '
 
 test_expect_success \
        'Check the "push(f)" log' \
        '
        stg pop &&
-       stg refresh -m "Foo2 Patch" &&
+       stg edit -m "Foo2 Patch" &&
        stg push &&
-       stg log | grep -q -e "^push(f)  "
+       stg log --full | grep -q -e "^push(f) "
        '
 
 test_expect_success \
@@ -65,21 +75,31 @@ test_expect_success \
        stg pop &&
        echo foo2 > test && stg refresh &&
        stg push &&
-       stg log | grep -q -e "^push(m)  "
+       stg log --full | 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 --full | grep -q -e "^push(c) "
        '
 
 test_expect_success \
        'Check the push "undo" log' \
        '
        stg push --undo &&
-       stg log bar | grep -q -e "^undo "
+       stg log --full bar | grep -q -e "^undo    "
        '
 
 test_expect_success \
        'Check the refresh "undo" log' \
        '
        stg refresh --undo &&
-       stg log | grep -q -e "^undo     "
+       stg log --full | grep -q -e "^undo    "
        '
 
 test_done