pick-to-branch: restrict 'git pull --ff-only' to target branch

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/101)

diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch
index a1e05b1f012c32c95f06e0c8cc9e2533a617db41..dd361297722e0222957846fdd89c47087477a798 100755 (executable)
--- a/review-tools/pick-to-branch
+++ b/review-tools/pick-to-branch
@@ -110,7 +110,7 @@ trap 'cleanup' EXIT
 git checkout --quiet master
 git checkout $target
 ORIG_TARGET_HEAD=`git show -s --format="%H"`
-git pull --ff-only
+git pull --ff-only `git rev-parse --abbrev-ref  @{u} | sed "s|/| |"`
 CHERRYPICKING=1
 git cherry-pick -e -x $id~$num..$id || (git cherry-pick --abort; exit 1)
 CHERRYPICKING=