From c7dbdf8e117396b3180dbd0ea8fcf3b38587cac4 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 15 Feb 2021 17:02:11 +0200 Subject: [PATCH] Do not apply force flag to git.reset Return applying force flag to all distros. Instead we don't apply force flag for `git reset` command at all. Change-Id: I81556c641f891773474644f842ff3b07493e8715 --- playbooks/library/git_requirements.py | 3 +-- scripts/get-ansible-role-requirements.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/playbooks/library/git_requirements.py b/playbooks/library/git_requirements.py index 4e69cdfdb9..cbe39f9401 100644 --- a/playbooks/library/git_requirements.py +++ b/playbooks/library/git_requirements.py @@ -121,8 +121,7 @@ def reset_to_version(path, version, reset_type='--hard', force=False, return ["Failed to fetch %s\n%s" % (modify_repo.working_dir, str(e))] try: - modify_repo.git.reset(reset_type, version, - force=force, refspec=refspec) + modify_repo.git.reset(reset_type, version, refspec=refspec) except Exception as e: return ["Failed to reset %s\n%s" % (modify_repo.working_dir, str(e))] diff --git a/scripts/get-ansible-role-requirements.yml b/scripts/get-ansible-role-requirements.yml index a45813f7bf..d80758a29e 100644 --- a/scripts/get-ansible-role-requirements.yml +++ b/scripts/get-ansible-role-requirements.yml @@ -130,7 +130,7 @@ repo_info: "{{ clone_roles }}" retries: "{{ git_clone_retries }}" delay: "{{ git_clone_retry_delay }}" - force: "{{ not (ansible_distribution | lower == 'ubuntu' and ansible_distribution_version is version('20.04', '>=')) }}" + force: true core_multiplier: 4 rescue: - name: Clone git repos (with git)