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:
parent
fcd07c975f
commit
61a142260a
|
@ -221,7 +221,7 @@ class Repo(object):
|
||||||
try:
|
try:
|
||||||
with timeout_handler(self.local_path):
|
with timeout_handler(self.local_path):
|
||||||
repo.git.fetch(remote, ref,
|
repo.git.fetch(remote, ref,
|
||||||
kill_after_timeout=self.git_timeout,
|
kill_after_timeout=self.git_timeout, f=True,
|
||||||
**kwargs)
|
**kwargs)
|
||||||
break
|
break
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|
Loading…
Reference in New Issue