diff options
Diffstat (limited to 'zuul/merger')
| -rw-r--r-- | zuul/merger/merger.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/zuul/merger/merger.py b/zuul/merger/merger.py index 94933dec5..0c9f168ad 100644 --- a/zuul/merger/merger.py +++ b/zuul/merger/merger.py @@ -182,6 +182,13 @@ class Repo(object): repo = self.createRepoObject() self.log.debug("Updating repository %s" % self.local_path) origin = repo.remotes.origin + if repo.git.version_info[:2] < (1, 9): + # Before 1.9, 'git fetch --tags' did not include the + # behavior covered by 'git --fetch', so we run both + # commands in that case. Starting with 1.9, 'git fetch + # --tags' is all that is necessary. See + # https://github.com/git/git/blob/master/Documentation/RelNotes/1.9.0.txt#L18-L20 + origin.fetch() origin.fetch(tags=True) |