ettore.dreucci/technitium_zone_exporter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebase with autostash. Pass env to git command

Browse Source
This commit is contained in:
Ettore Dreucci
2025-10-04 23:32:50 +02:00
parent 6880f826e8
commit da008ba847
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/git.py
View File

@@ -6,10 +6,10 @@ from pathlib import Path
from config import * from config import *
def run_git_cmd(args, check=True, capture_output=False): def run_git_cmd(args, check=True, capture_output=False, env = None):
cmd = ["git", "-C", GIT_REPO_DIR] + args cmd = ["git", "-C", GIT_REPO_DIR] + args
logging.debug(f"Running git: {' '.join(cmd)}") logging.debug(f"Running git: {' '.join(cmd)}")
return subprocess.run(cmd, check=check, capture_output=capture_output, text=True) return subprocess.run(cmd, check=check, capture_output=capture_output, text=True, env=env)
def ensure_git_repo(): def ensure_git_repo():

4
src/helpers.py
View File

@@ -22,7 +22,7 @@ def write_zone_export(zone_name, content) -> Path:
def commit_and_push(changed_files, trigger_path): def commit_and_push(changed_files, trigger_path):
# Pull from remote, rebasing # Pull from remote, rebasing
try: try:
run_git_cmd(["pull", "--rebase", "origin", "master"]) run_git_cmd(["pull", "--rebase", "--autostash", "origin", "master"])
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
logging.exception(f"git pull --rebase failed: {e}") logging.exception(f"git pull --rebase failed: {e}")
return return
@@ -52,7 +52,7 @@ def commit_and_push(changed_files, trigger_path):
env["GIT_AUTHOR_NAME"] = GIT_AUTHOR_NAME env["GIT_AUTHOR_NAME"] = GIT_AUTHOR_NAME
env["GIT_AUTHOR_EMAIL"] = GIT_AUTHOR_EMAIL env["GIT_AUTHOR_EMAIL"] = GIT_AUTHOR_EMAIL
try: try:
run_git_cmd(["commit", "-m", commit_msg], check=True) run_git_cmd(["commit", "-m", commit_msg], check=True, env=env)
logging.info("Committed changes to git.") logging.info("Committed changes to git.")
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
logging.exception(f"git commit failed: {e}") logging.exception(f"git commit failed: {e}")