chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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..17ce02c9f4a904724d802a825e42a22c2aa61a62 100644
(file)
--- a/
tg-mail.sh
+++ b/
tg-mail.sh
@@
-3,6
+3,7
@@
# GPLv2
name=
# GPLv2
name=
+head_from=
send_email_args=
in_reply_to=
send_email_args=
in_reply_to=
@@
-12,12
+13,15
@@
in_reply_to=
while [ -n "$1" ]; do
arg="$1"; shift
case "$arg" in
while [ -n "$1" ]; do
arg="$1"; shift
case "$arg" in
+ -i|-w)
+ [ -z "$head_from" ] || die "-i and -w are mutually exclusive"
+ head_from="$arg";;
-s)
send_email_args="$1"; shift;;
-r)
in_reply_to="$1"; shift;;
-*)
-s)
send_email_args="$1"; shift;;
-r)
in_reply_to="$1"; shift;;
-*)
- echo "Usage: tg [...] mail [-s SEND_EMAIL_ARGS] [-r REFERENCE_MSGID] [NAME]" >&2
+ echo "Usage: tg [...] mail [-s SEND_EMAIL_ARGS] [-r REFERENCE_MSGID] [
-i | -w] [
NAME]" >&2
exit 1;;
*)
[ -z "$name" ] || die "name already specified ($name)"
exit 1;;
*)
[ -z "$name" ] || die "name already specified ($name)"
@@
-25,24
+29,22
@@
while [ -n "$1" ]; do
esac
done
esac
done
-[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
+head="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
+[ -n "$name" ] || name="$head"
base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
die "not a TopGit-controlled branch"
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
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
fi
-patchfile="$(
mktemp -t tg-mail.XXXXXX
)"
+patchfile="$(
get_temp tg-mail
)"
-$tg patch "$name" >"$patchfile"
+# let tg patch sort out whether $head_from makes sense for $name
+$tg patch "$name" $head_from >"$patchfile"
-header="$(sed -e '/^$/,$d' "$patchfile")"
+header="$(sed -e '/^$/,$d'
-e "s,','\\\\'',g"
"$patchfile")"
@@
-58,6
+60,4
@@
people=
# NOTE: git-send-email handles cc itself
eval git send-email $send_email_args "$people" "$patchfile"
# NOTE: git-send-email handles cc itself
eval git send-email $send_email_args "$people" "$patchfile"
-rm "$patchfile"
-
# vim:noet
# vim:noet