From af86c85638432627e70efb751f7fd5ce7960dea5 Mon Sep 17 00:00:00 2001 From: "Ben D." Date: Sat, 14 Mar 2026 17:04:21 -0700 Subject: [PATCH] =?UTF-8?q?Order=20is=20now:=20stage=20=E2=86=92=20pull=20?= =?UTF-8?q?rebase=20=E2=86=92=20commit=20=E2=86=92=20push.=20Staging=20fir?= =?UTF-8?q?st=20means=20the=20working=20tree=20is=20clean=20bef?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/hypervisor_backup_config/tasks/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/hypervisor_backup_config/tasks/main.yml b/roles/hypervisor_backup_config/tasks/main.yml index 054aac3..4dadc1b 100644 --- a/roles/hypervisor_backup_config/tasks/main.yml +++ b/roles/hypervisor_backup_config/tasks/main.yml @@ -83,6 +83,13 @@ delegate_to: localhost changed_when: false + - name: Git | Stage backup files + ansible.builtin.shell: | + cd {{ pve_config_git_repo_dir }} + git add {{ pve_config_git_base_path }}/ + delegate_to: localhost + when: git_status.stdout != "" + - name: Git | Pull latest before committing ansible.builtin.shell: | cd {{ pve_config_git_repo_dir }} @@ -91,13 +98,6 @@ when: git_status.stdout != "" changed_when: false - - name: Git | Stage backup files - ansible.builtin.shell: | - cd {{ pve_config_git_repo_dir }} - git add {{ pve_config_git_base_path }}/ - delegate_to: localhost - when: git_status.stdout != "" - - name: Git | Commit backup ansible.builtin.shell: | cd {{ pve_config_git_repo_dir }}