From 6e53844f1edd3c9a3898f0af74fcc8da04b7de48 Mon Sep 17 00:00:00 2001
From: Xin Li <delphij@google.com>
Date: Mon, 10 Dec 2018 11:33:16 -0800
Subject: [PATCH] Allow clobbering of existing tags from remote.

Bug: 120778183
Change-Id: Id44e2b68abc410a3afd4e07a3c943b0936347e38
---
 project.py | 2 +-
 repo       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.py b/project.py
index b8147424..77a4f571 100755
--- a/project.py
+++ b/project.py
@@ -2187,7 +2187,7 @@ class Project(object):
     cmd.append(bundle_dst)
     for f in remote.fetch:
       cmd.append(str(f))
-    cmd.append('refs/tags/*:refs/tags/*')
+    cmd.append('+refs/tags/*:refs/tags/*')
 
     ok = GitCommand(self, cmd, bare=True).Wait() == 0
     if os.path.exists(bundle_dst):
diff --git a/repo b/repo
index 998731c6..7e7f13fa 100755
--- a/repo
+++ b/repo
@@ -536,7 +536,7 @@ def _Fetch(url, local, src, quiet):
     err = None
   cmd.append(src)
   cmd.append('+refs/heads/*:refs/remotes/origin/*')
-  cmd.append('refs/tags/*:refs/tags/*')
+  cmd.append('+refs/tags/*:refs/tags/*')
 
   proc = subprocess.Popen(cmd, cwd=local, stderr=err)
   if err: