merge: do not create a signed tag merge under --ff-only option

diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
index ea6f692bafa9f2c4f81985a50ed79a1c5016b493..da25bc2d1fb3a68b1d29b1a5b3f5d18f6c0ffdca 100755 (executable)
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@ -67,9 +67,11 @@ test_expect_success 'setup: two scripts for reading pull requests' '
 
        cat <<-\EOT >read-request.sed &&
        #!/bin/sed -nf
+       # Note that a request could ask for "tag $tagname"
        / in the git repository at:$/!d
        n
        /^$/ n
+       s/ tag \([^ ]*\)$/ tag--\1/
        s/^[    ]*\(.*\) \([^ ]*\)/please pull\
        \1\
        \2/p
@@ -178,6 +180,7 @@ test_expect_success 'request names an appropriate branch' '
                read branch
        } <digest &&
        {
+               test "$branch" = full ||
                test "$branch" = master ||
                test "$branch" = for-upstream
        }