From 136ed8f84d9c8ab852698375deccf85090e21913 Mon Sep 17 00:00:00 2001
From: Tim Ruffing <crypto@timruffing.de>
Date: Wed, 10 Mar 2021 16:02:32 +0100
Subject: [PATCH] sync-upstream: Fix output of command to reproduce

---
 contrib/sync-upstream.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/contrib/sync-upstream.sh b/contrib/sync-upstream.sh
index 24606a39..c9f47d2e 100755
--- a/contrib/sync-upstream.sh
+++ b/contrib/sync-upstream.sh
@@ -4,7 +4,7 @@ set -eou pipefail
 
 help() {
     echo "$0 range [end]"
-    echo "    merges every merge commit missing merge commit."
+    echo "    merges every merge commit present in upstream and missing locally."
     echo "    If the optional [end] commit is provided, only merges up to [end]."
     echo
     echo "$0 select <commit> ... <commit>"
@@ -42,7 +42,7 @@ setup() {
 
 range() {
     RANGESTART_COMMIT=$(git merge-base $REMOTE_BRANCH master)
-    RANGEEND_COMMIT=$REMOTE_BRANCH
+    RANGEEND_COMMIT=$(git rev-parse $REMOTE_BRANCH)
     if [ "$#" = 1 ]; then
         RANGEEND_COMMIT=$1
     fi
@@ -62,11 +62,13 @@ case $1 in
         shift
         setup
         range "$@"
+        REPRODUCE_COMMAND="$0 range $RANGEEND_COMMIT"
         ;;
     select)
         shift
         setup
         COMMITS=$*
+        REPRODUCE_COMMAND="$0 $@"
         ;;
     help)
         help
@@ -86,7 +88,7 @@ done
 # Remove trailing ","
 TITLE=${TITLE%?}
 
-BODY=$(printf "%s\n\n%s" "$BODY" "This PR was automatically created with \\\`$0 $*\\\`.")
+BODY=$(printf "%s\n\n%s" "$BODY" "This PR can be recreated  with \`$REPRODUCE_COMMAND\`.")
 
 echo "-----------------------------------"
 echo "$TITLE"