summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2018-12-10 11:33:16 -0800
committerXin Li <delphij@google.com>2018-12-10 11:33:16 -0800
commit6e53844f1edd3c9a3898f0af74fcc8da04b7de48 (patch)
tree06e0405db8ec3dea929f7309186b500b49bd0985
parentd26146de7f1b76e9f212492dd80677f16bd00cc0 (diff)
downloadgit-repo-6e53844f1edd3c9a3898f0af74fcc8da04b7de48.tar.gz
Allow clobbering of existing tags from remote.v1.13.0
Bug: 120778183 Change-Id: Id44e2b68abc410a3afd4e07a3c943b0936347e38
-rwxr-xr-xproject.py2
-rwxr-xr-xrepo2
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):
2187 cmd.append(bundle_dst) 2187 cmd.append(bundle_dst)
2188 for f in remote.fetch: 2188 for f in remote.fetch:
2189 cmd.append(str(f)) 2189 cmd.append(str(f))
2190 cmd.append('refs/tags/*:refs/tags/*') 2190 cmd.append('+refs/tags/*:refs/tags/*')
2191 2191
2192 ok = GitCommand(self, cmd, bare=True).Wait() == 0 2192 ok = GitCommand(self, cmd, bare=True).Wait() == 0
2193 if os.path.exists(bundle_dst): 2193 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):
536 err = None 536 err = None
537 cmd.append(src) 537 cmd.append(src)
538 cmd.append('+refs/heads/*:refs/remotes/origin/*') 538 cmd.append('+refs/heads/*:refs/remotes/origin/*')
539 cmd.append('refs/tags/*:refs/tags/*') 539 cmd.append('+refs/tags/*:refs/tags/*')
540 540
541 proc = subprocess.Popen(cmd, cwd=local, stderr=err) 541 proc = subprocess.Popen(cmd, cwd=local, stderr=err)
542 if err: 542 if err: