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 b18283869839fb9af9acbda16e6ab7c2affe7697..5b842d0b116246398a29d4766d4185c3ed98a63c 100755 (executable)
--- a/t/t1400-patch-history.sh
+++ b/t/t1400-patch-history.sh
@@ -44,8 +44,11 @@ test_expect_success \
 test_expect_success \
        'Check the log annotation' \
        '
-       stg log foo | grep -q -e "\[refresh\] foo notes "
-       stg log bar | grep -q -e "\[refresh\]           "
+       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 \
@@ -61,7 +64,7 @@ test_expect_success \
        '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) "
        '