Merge commit 'refs/top-bases/fixes/tg--r-require-arg' into fixes/tg--r-require-arg

[topgit.git] / tg-mail.sh

diff --git a/tg-mail.sh b/tg-mail.sh
index 8d3b6320a11dfb945f2a70821ae7063a431dffff..8167adecb7421d6750205bd9304243f587a2e4d4 100644 (file)
--- a/tg-mail.sh
+++ b/tg-mail.sh
@@ -29,12 +29,8 @@ done
 base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
        die "not a TopGit-controlled branch"
 
-if ! git send-emmail --help >/dev/null 2>&1; then
-       die "git send-email command not available"
-fi
-
 if [ -n "$in_reply_to" ]; then
-       send_email_args="$send_email_args --in-reply-to=$in_reply_to"
+       send_email_args="$send_email_args --in-reply-to='$in_reply_to'"
 fi
 
 
@@ -42,7 +38,7 @@ patchfile="$(mktemp -t tg-mail.XXXXXX)"
 
 $tg patch "$name" >"$patchfile"
 
-header="$(sed -e '/^$/,$d' "$patchfile")"
+header="$(sed -e '/^$/,$d' -e "s,','\\\\'',g" "$patchfile")"