]> granicus.if.org Git - pdns/commitdiff
cherry-pick-pr: fix branch name in merge command
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Mon, 1 Jul 2019 08:20:46 +0000 (10:20 +0200)
committerPeter van Dijk <peter.van.dijk@powerdns.com>
Mon, 1 Jul 2019 08:20:46 +0000 (10:20 +0200)
build-scripts/cherry-pick-pr.py

index 1c0319456e919676dad7706464f37cb90ff3c2f2..40c125e519aba6a06ac3bd4d388150bb8a13df42 100755 (executable)
@@ -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)