create-help.sh: Fix 'tg update' generated help text

[topgit.git] / tg-create.sh

diff --git a/tg-create.sh b/tg-create.sh
index 30c69c9ee1929ba80af155e46e704c4e339f7d73..6cce7edebc1102bc9cfe86226f96ee40bc1ab8c0 100644 (file)
--- a/tg-create.sh
+++ b/tg-create.sh
@@ -14,20 +14,22 @@ name=
 while [ -n "$1" ]; do
        arg="$1"; shift
        case "$arg" in
-       -d)
-               deps="$(echo "$1" | sed 's/,/ /g')"; shift;;
        -*)
-               echo "Usage: tg create [-d DEPS...] NAME" >&2
+               echo "Usage: tg create NAME [DEPS...]" >&2
                exit 1;;
        *)
-               [ -z "$name" ] || die "name already specified ($name)"
-               name="$arg";;
+               if [ -z "$name" ]; then
+                       name="$arg"
+               else
+                       deps="$deps $arg"
+               fi;;
        esac
 done
 
 
 ## Auto-guess dependencies
 
+deps="${deps# }"
 if [ -z "$deps" ]; then
        head="$(git symbolic-ref HEAD)"
        bname="${head#refs/top-bases/}"
@@ -102,7 +104,11 @@ author="$(git var GIT_AUTHOR_IDENT)"
 author_addr="${author%> *}>"
 {
        echo "From: $author_addr"
-       echo "Subject: [PATCH] $1"
+       ! header="$(git config topgit.to)" || echo "To: $header"
+       ! header="$(git config topgit.cc)" || echo "Cc: $header"
+       ! header="$(git config topgit.bcc)" || echo "Bcc: $header"
+       ! subject_prefix="$(git config topgit.subjectprefix)" || subject_prefix="$subject_prefix "
+       echo "Subject: [${subject_prefix}PATCH] $name"
        echo
        cat <<EOT
 <patch description>