From 94de79d48d1b299e2a7e3344d97d51d2a962fe12 Mon Sep 17 00:00:00 2001 From: Mariatta Wijaya Date: Wed, 18 Oct 2017 20:41:32 -0700 Subject: [PATCH] Don't prefix the commit message with branch number. Only add the branch prefix to the PR title. Use cherry_picker v0.2.4 Closes https://github.com/python/miss-islington/issues/38 --- backport/tasks.py | 3 ++- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backport/tasks.py b/backport/tasks.py index 67e7bd492..f8d1100bb 100644 --- a/backport/tasks.py +++ b/backport/tasks.py @@ -46,7 +46,8 @@ def backport_task(commit_hash, branch, *, issue_number, created_by, merged_by): cherry_picker {commit_hash} {branch} ``` """) - cp = cherry_picker.CherryPicker('origin', commit_hash, [branch]) + cp = cherry_picker.CherryPicker('origin', commit_hash, [branch], + prefix_commit=False) try: cp.backport() except cherry_picker.BranchCheckoutException: diff --git a/requirements.txt b/requirements.txt index d91668563..6b310cecd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -cherry_picker +cherry_picker==0.2.4 aiohttp gidgethub cachetools