Merge branch 'maint'

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 8bfeef9b0bf6eedcd1f0b31a141efc87a37041f8..fa207f3b8cae5397904f5fb8da2b20b67d297415 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1180,8 +1180,8 @@ test_expect_success 'message in editor has initial comment: first line' '
 test_expect_success \
        'message in editor has initial comment: remainder' '
        # remove commented lines from the remainder -- should be empty
-       >rest.expect
-       sed -e 1d -e '/^#/d' <actual >rest.actual &&
+       >rest.expect &&
+       sed -e 1d -e "/^#/d" <actual >rest.actual &&
        test_cmp rest.expect rest.actual
 '