diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-11-26 17:14:52 +0300 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-12-03 14:44:27 +0300 |
| commit | b2ddb46e81f60f6eaf5f598526e9cbde57fda6ca (patch) | |
| tree | 9755eeb93a715cfb10c1a03c49a85d7de3f08403 | |
| parent | 7f88b33177be032aca32a32c308cfeafb4db9e2d (diff) | |
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)
| -rwxr-xr-x | review-tools/pick-to-branch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch index a1e05b1..dd36129 100755 --- 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= |