karma/crab
1
0
Fork 0
mirror of https://github.com/karma-riuk/crab.git synced 2025-07-05 13:38:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

found out that some couldn't checkout due to

Browse Source 
conflicts, but if you force it, it works
This commit is contained in:
Karma Riuk
2025-05-14 09:36:12 +02:00
parent ccd962c205
commit 0b02518374
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pull_requests.py
View File

@ -122,7 +122,7 @@ def checkout(repo_path: str, sha: str, pr_number: int) -> None:
raise CantEnsureFullHistoryError(e.stderr) raise CantEnsureFullHistoryError(e.stderr)
try: try:
run_git_cmd(["checkout", sha], repo_path) run_git_cmd(["checkout", "-f", sha], repo_path)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
try: try:
run_git_cmd(["fetch", "origin", f"pull/{pr_number}/merge"], repo_path) run_git_cmd(["fetch", "origin", f"pull/{pr_number}/merge"], repo_path)
@ -130,7 +130,7 @@ def checkout(repo_path: str, sha: str, pr_number: int) -> None:
raise CantFetchPRError(e.stderr) raise CantFetchPRError(e.stderr)
try: try:
run_git_cmd(["checkout", sha], repo_path) run_git_cmd(["checkout", "-f", sha], repo_path)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise CantCheckoutCommitError(e.stderr) raise CantCheckoutCommitError(e.stderr)