zuul
/
zuul
Code Issues Proposed changes

Force fetch when updating merger repositories 

Deleting a tag from a repository causes the merger
to fail with a 'would clobber existing tag' message
from git.

Forcing the fetch fixes this.

Change-Id: Ia658fc673dcebcd55ecdb424f6b74481213418c4
This commit is contained in:
Albin Vass 2020-01-09 16:36:50 +01:00 committed by vass
parent fcd07c975f
commit 61a142260a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zuul/merger/merger.py
View File

@ -221,7 +221,7 @@ class Repo(object):
try:
with timeout_handler(self.local_path):
repo.git.fetch(remote, ref,
kill_after_timeout=self.git_timeout,
kill_after_timeout=self.git_timeout, f=True,
**kwargs)
break
except Exception as e: