The branch master has been updated via 744aefc2c80dbc3bd311cde0e5b75930b1da7381 (commit) via 3b4084c37a6c2d1a9280b71a873dd0e057aec0be (commit) from debabf50f5f2d7d0de575c69f8af642e9e84ae77 (commit)
- Log ----------------------------------------------------------------- commit 744aefc2c80dbc3bd311cde0e5b75930b1da7381 Author: Dr. David von Oheimb <david.von.ohe...@siemens.com> Date: Mon Nov 8 12:52:31 2021 +0100 pick-to-branch: make sure that local branch is up-to-date Reviewed-by: Paul Dale <pa...@openssl.org> Reviewed-by: Tomas Mraz <to...@openssl.org> (Merged from https://github.com/openssl/tools/pull/98) commit 3b4084c37a6c2d1a9280b71a873dd0e057aec0be Author: Dr. David von Oheimb <david.von.ohe...@siemens.com> Date: Mon Nov 8 12:46:35 2021 +0100 pick-to-branch: revert cherry-pick if aborted by user Reviewed-by: Paul Dale <pa...@openssl.org> Reviewed-by: Tomas Mraz <to...@openssl.org> (Merged from https://github.com/openssl/tools/pull/98) ----------------------------------------------------------------------- Summary of changes: review-tools/pick-to-branch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch index e7e1000..18a25e5 100755 --- a/review-tools/pick-to-branch +++ b/review-tools/pick-to-branch @@ -97,6 +97,7 @@ trap 'cleanup' EXIT git checkout --quiet master git checkout $branch +git pull --ff-only git cherry-pick -e -x $id || (git cherry-pick --abort; exit 1) while true @@ -113,4 +114,6 @@ done if [ "$x" = "y" -o "$x" = "yes" ] then git push +else + git reset --hard @~1 fi