Skip to content

chore: fix edge case for git bare operation. #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IRONICBo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: fix edge case for git bare operation. #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions memov/core/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ def subprocess_call(
"check": True,
"stdout": subprocess.PIPE,
"stderr": subprocess.PIPE,
"encoding": "utf-8",
"text": text,
}

if text:
kwargs["encoding"] = "utf-8"
if input is not None:
kwargs["input"] = input
else:
Expand Down Expand Up @@ -291,9 +292,12 @@ def git_show(bare_repo: str, commit_id: str) -> None:
command = ["git", f"--git-dir={bare_repo}", "show", commit_id]
success, output = subprocess_call(command=command)

sys.stdout.write(output.stdout)
if output.stderr:
sys.stderr.write(output.stderr)
if success and output:
sys.stdout.write(output.stdout)
if output.stderr:
sys.stderr.write(output.stderr)
else:
LOGGER.error(f"Failed to show commit {commit_id} in repository at {bare_repo}")

@staticmethod
def get_commit_history(bare_repo: str, tip: str) -> list[str]:
Expand All @@ -312,8 +316,9 @@ def get_commit_history(bare_repo: str, tip: str) -> list[str]:
if success:
return output.stdout.strip().splitlines()
else:
err_msg = output.stderr if output else "Unknown error"
LOGGER.error(
f"Failed to get commit history for {tip} in repository at {bare_repo}: {output.stderr}"
f"Failed to get commit history for {tip} in repository at {bare_repo}: {err_msg}"
)
return []

Expand Down