dolphin-emu/archived-central
1
0
Fork 0
mirror of https://github.com/dolphin-emu/central.git synced 2026-01-31 01:15:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from dolphin-emu/git-error

Browse Source 
git: Add --force argument to second fetch command
This commit is contained in:
OatmealDome
2025-09-17 01:28:19 -04:00
committed by GitHub
parent 50c29d4df0 2e0fe752c8
commit 3e7719a269
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
central/git.py
View File

@@ -36,13 +36,19 @@ class GitRepository:
"GIT_COMMITTER_EMAIL": "central@dolphin-emu.org",
}
logging.debug("[%s] running git command: %s", self.path, args)
out = subprocess.run(
(self.git_path,) + args,
cwd=self.path,
check=True,
env=env,
capture_output=True,
)
try:
out = subprocess.run(
(self.git_path,) + args,
cwd=self.path,
check=True,
env=env,
capture_output=True,
)
except subprocess.CalledProcessError as e:
logging.error("git command failed with stderr: %s" % e.stderr)
raise
return out.stdout.decode("utf-8").strip()
def clone(self, origin):
@@ -51,7 +57,7 @@ class GitRepository:
def fetch(self):
self.git_cli("fetch", "--all", "--tags", "--prune")
self.git_cli("update-ref", "HEAD", "FETCH_HEAD")
self.git_cli("fetch", "origin", "refs/heads/*:refs/heads/*")
self.git_cli("fetch", "--force", "origin", "refs/heads/*:refs/heads/*")
def commit_log(self, hash, format):
return self.git_cli("log", "-1", f"--format=format:{format}", hash)