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

Pull and rebase before committing

Browse Source
This commit is contained in:
Ettore Dreucci
2025-10-04 19:05:13 +02:00
parent aa8fff37ea
commit 6880f826e8
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/helpers.py
View File

@@ -20,6 +20,13 @@ def write_zone_export(zone_name, content) -> Path:
return out_path return out_path
def commit_and_push(changed_files, trigger_path): def commit_and_push(changed_files, trigger_path):
# Pull from remote, rebasing
try:
run_git_cmd(["pull", "--rebase", "origin", "master"])
except subprocess.CalledProcessError as e:
logging.exception(f"git pull --rebase failed: {e}")
return
# Stage files # Stage files
try: try:
# Add only the exports folder (keeps repo tidy) # Add only the exports folder (keeps repo tidy)
@@ -31,7 +38,7 @@ def commit_and_push(changed_files, trigger_path):
# Check if there is anything to commit # Check if there is anything to commit
try: try:
# git diff --cached --quiet will exit 0 if no changes staged # git diff --cached --quiet will exit 0 if no changes staged
subprocess.run(["git", "-C", GIT_REPO_DIR, "diff", "--cached", "--quiet"], check=True) run_git_cmd(["diff", "--cached", "--quiet"], check=True)
logging.info("No changes to commit (nothing staged).") logging.info("No changes to commit (nothing staged).")
return return
except subprocess.CalledProcessError: except subprocess.CalledProcessError: