mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-05-11 03:31:29 -07:00
git: git reset with branch
`git reset <ref>` can be ambiguous and fail to switch to the correct branch. To avoid it, specify branch as well.
This commit is contained in:
parent
79fa5ef4cb
commit
99ef1f3a9f
3 changed files with 33 additions and 1 deletions
31
test/integration/targets/git/tasks/ambiguous-ref.yml
Normal file
31
test/integration/targets/git/tasks/ambiguous-ref.yml
Normal file
|
@ -0,0 +1,31 @@
|
|||
---
|
||||
|
||||
# test for https://github.com/ansible/ansible-modules-core/pull/3386
|
||||
|
||||
- name: clone repo
|
||||
git:
|
||||
repo: '{{ repo_format1 }}'
|
||||
dest: '{{ checkout_dir }}'
|
||||
|
||||
- name: rename remote to be ambiguous
|
||||
command: git remote rename origin v0.1 chdir="{{ checkout_dir }}"
|
||||
|
||||
- name: switch to HEAD
|
||||
git:
|
||||
repo: '{{ repo_format1 }}'
|
||||
dest: '{{ checkout_dir }}'
|
||||
remote: v0.1
|
||||
|
||||
- name: rev-parse remote HEAD
|
||||
command: git rev-parse v0.1/HEAD chdir="{{ checkout_dir }}"
|
||||
register: git_remote_head
|
||||
|
||||
- name: rev-parse local HEAD
|
||||
command: git rev-parse HEAD chdir="{{ checkout_dir }}"
|
||||
register: git_local_head
|
||||
|
||||
- assert:
|
||||
that: git_remote_head.stdout == git_local_head.stdout
|
||||
|
||||
- name: clear checkout_dir
|
||||
file: state=absent path={{ checkout_dir }}
|
|
@ -30,3 +30,4 @@
|
|||
- include: tag-verification.yml
|
||||
- include: localmods.yml
|
||||
- include: reset-origin.yml
|
||||
- include: ambiguous-ref.yml
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue