HACKING: First cut

[dgit.git] / git-debpush

diff --git a/git-debpush b/git-debpush
index 0be0bf4a37b486b707771246117382e2802a56d3..beb24fbf2ba7b421ede799540d445bd40adb6ce9 100755 (executable)
--- a/git-debpush
+++ b/git-debpush
@@ -38,8 +38,8 @@ set -o pipefail
 # **** Helper functions and variables ****
 
 us="$(basename $0)"
-git_playtree_create=git-playtree-create ###substituted###
-git_playtree_create=${DEBPUSH_GIT_PLAYTREE_CREATE-$git_playtree_create}
+git_playtree_setup=git-playtree-setup ###substituted###
+git_playtree_setup=${DEBPUSH_GIT_PLAYTREE_SETUP-$git_playtree_setup}
 
 cleanup() {
     if [ -d "$temp" ]; then
@@ -246,9 +246,9 @@ case "$format" in
     '3.0 (quilt)')  upstream=true ;;
     '3.0 (native)') upstream=false ;;
     '1.0'|'')
-       if get_file_from_ref debian/source/options | grep '^-sn *$'; then
+       if get_file_from_ref debian/source/options | grep -q '^-sn *$'; then
            upstream=false
-        elif get_file_from_ref debian/source/options | grep '^-sk *$'; then
+        elif get_file_from_ref debian/source/options | grep -q '^-sk *$'; then
            upstream=true
        else
            fail 'please see "SOURCE FORMAT 1.0" in git-debpush(1)'
@@ -393,12 +393,13 @@ if [ "$format" = "3.0 (quilt)" ]; then
     fi
 fi
 
-git tag "${git_tag_opts[@]}" -s -F- "$debian_tag" "$branch" <<EOF
-$source release $version for $target
+tagmessage="$source release $version for $target
 
 [dgit distro=$distro split$quilt_mode_text]
 [dgit please-upload$upstream_info]
-EOF
+"
+
+git tag "${git_tag_opts[@]}" -s -m "$tagmessage" "$debian_tag" "$branch"
 
 # **** Do a git push ****