From f75c0cd6508eeb5ed23be0778f4862116e1f526e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Mon, 17 Jun 2024 11:50:33 +0200 Subject: [PATCH] Support pre-commit modification con commit --- github_app_geo_project/module/utils.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/github_app_geo_project/module/utils.py b/github_app_geo_project/module/utils.py index d6322e66294..e4dc25417ce 100644 --- a/github_app_geo_project/module/utils.py +++ b/github_app_geo_project/module/utils.py @@ -562,7 +562,7 @@ def has_changes(include_un_followed: bool = False) -> bool: return proc.returncode != 0 -async def create_commit(message: str) -> bool: +async def create_commit(message: str, pre_commit_check: bool = True) -> bool: """Do a commit.""" proc = subprocess.run( # nosec # pylint: disable=subprocess-run-check ["git", "add", "--all"], capture_output=True, encoding="utf-8", timeout=30 @@ -573,13 +573,16 @@ async def create_commit(message: str) -> bool: _LOGGER.warning(proc_message) return False _, success, _ = await run_timeout( - ["git", "commit", f"--message={message}"], + ["git", "commit", f"--message={message}", *([] if pre_commit_check else ["--no-verify"])], None, 600, "Commit", "Error committing files", "Timeout committing files", ) + if not success and pre_commit_check: + # On pre-commit issues, add them to the commit, and try again without the pre-commit + success = await create_commit(message, False) return success