Handle pushing to non-bare remote repos

When we're pushing to a non-bare repo, git has a sad if we push to the
branch that's checked out. But that's ok - we're going to update the
checked out state anyway as a follow up. Tell git it's ok.

Then, after we've pushed, we need to reset after having pushed branch HEAD
to a non bare repo. Clean up after ourselves by removing the config
setting we added to allow the push in the first place.

Change-Id: Id84e9af9d33519e515b8e6d330b375a8e17c14f5
This commit is contained in:
Monty Taylor
2017-08-31 09:29:05 -05:00
parent 113c14aad5
commit dd6bf58d66

View File

@@ -1,3 +1,9 @@
- name: Allow pushing to non-bare repo
command: "git config --local receive.denyCurrentBranch ignore"
args:
chdir: "{{ ansible_user_dir }}/{{ item.src_dir}}"
with_items: "{{ zuul.projects }}"
- name: Synchronize src repos to workspace directory
command: "git push --mirror git+ssh://{{ ansible_user }}@{{ ansible_host }}/{{ ansible_user_dir }}/{{ item.src_dir}}"
args:
@@ -13,8 +19,15 @@
delegate_to: localhost
register: statuses
- name: Checkout local HEAD on remote
command: "git checkout {{ item.1 }}"
# Do this as a multi-line shell so that we can do the loop once
- name: Update remote repository state correctly
shell: |
# Reset is needed because we pushed to a non-bare repo
git reset --hard
# Undo the config setting we did above
git config --local --unset receive.denyCurrentBranch
# checkout the branch matching the branch set up by the executor
git checkout {{ item.1 }}
args:
chdir: "{{ ansible_user_dir }}/{{ item.0.src_dir }}"
with_together: