Ensure we clean the repo before attempting to cherry-pick (#635)

python · Jul 22, 2023 · 93e2498 · 93e2498
1 parent 1b86818
commit 93e2498
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/miss_islington/tasks.py b/miss_islington/tasks.py
@@ -99,6 +99,11 @@ async def backport_task_asyncio(
                                    """,
                 )
                 await util.assign_pr_to_core_dev(gh, issue_number, merged_by)
+
+        # Ensure that we don't have any changes lying around
+        subprocess.check_output(['git', 'reset', '--hard'])
+        subprocess.check_output(['git', 'clean', '-fxd'])
+
         cp = cherry_picker.CherryPicker(
             "origin",
             commit_hash,