From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 1 Jul 2019 08:20:46 +0000 (+0200)
Subject: cherry-pick-pr: fix branch name in merge command
X-Git-Tag: dnsdist-1.4.0-rc1~80^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab74cfa878c79ff1e37d2aae7b10d9c2ecd74971;p=pdns

cherry-pick-pr: fix branch name in merge command
---

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)