From ab74cfa878c79ff1e37d2aae7b10d9c2ecd74971 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Mon, 1 Jul 2019 10:20:46 +0200 Subject: [PATCH] cherry-pick-pr: fix branch name in merge command --- build-scripts/cherry-pick-pr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-scripts/cherry-pick-pr.py b/build-scripts/cherry-pick-pr.py index 1c0319456..40c125e51 100755 --- a/build-scripts/cherry-pick-pr.py +++ b/build-scripts/cherry-pick-pr.py @@ -54,6 +54,6 @@ if args.merge_into: run_command(command) command = ['git', 'merge', '--no-ff', - 'backport-{}'.format(args.pull_request), '-m', + 'backport-{}-to-{}'.format(args.pull_request, args.merge_into[0].split('/')[-1]), '-m', 'Backport #{}'.format(args.pull_request)] run_command(command) -- 2.40.0