Handle conflict when cherry-picking changelog

fixes: pulp#439
dkliban · Jul 12, 2021 · f474ae0 · f474ae0
1 parent 1b40162
commit f474ae0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGES/439.bugfix b/CHANGES/439.bugfix
@@ -0,0 +1 @@
+Handle conflicts when cherry-picking changelog to master branch.
diff --git a/templates/github/.github/workflows/scripts/stage-changelog-for-master.py.j2 b/templates/github/.github/workflows/scripts/stage-changelog-for-master.py.j2
@@ -5,6 +5,7 @@ import os
 import textwrap
 
 from git import Repo
+from git.exc import GitCommandError
 
 
 helper = textwrap.dedent(
@@ -48,5 +49,11 @@ if not changelog_commit:
 git = repo.git
 git.stash()
 git.checkout("origin/master")
-git.cherry_pick(changelog_commit.hexsha)
+try:
+    git.cherry_pick(changelog_commit.hexsha)
+except GitCommandError:
+    git.add("CHANGES/")
+    # Don't try opening an editor for the commit message
+    with git.custom_environment(GIT_EDITOR='true'):
+        git.cherry_pick("--continue")
 git.reset("origin/master")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Handle conflicts when cherry-picking changelog to master branch.