Merge branch 'cc/replace-edit'

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 64d9434da9ff24ff0dc87057aab91866e09e7451..19a3ced600a20d805d430533b275a8fa4269b835 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1342,7 +1342,7 @@ test_cover_addresses () {
        git format-patch --cover-letter -2 -o outdir &&
        cover=`echo outdir/0000-*.patch` &&
        mv $cover cover-to-edit.patch &&
-       sed "s/^From:/$header: extra@address.com\nFrom:/" cover-to-edit.patch >"$cover" &&
+       perl -pe "s/^From:/$header: extra\@address.com\nFrom:/" cover-to-edit.patch >"$cover" &&
        git send-email \
          --force \
          --from="Example <nobody@example.com>" \