summaryrefslogtreecommitdiffstats
path: root/subcmds/upload.py
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2010-07-16 07:42:45 -0700
committerShawn O. Pearce <sop@google.com>2010-07-16 07:42:45 -0700
commit60829ba72fe81b1de1c1e9c6e0de486e9e90bddd (patch)
tree97c54e944ba5ee7d10897bdfe57e6dbe0e97ae59 /subcmds/upload.py
parenta22f99ae41a9cdda2129c89678a6f581b0445c85 (diff)
downloadgit-repo-60829ba72fe81b1de1c1e9c6e0de486e9e90bddd.tar.gz
upload: Fix --replace flagv1.6.10.2
--replace started to fail due to a Python error, I forgot to pass through the opt structure to the replace function. Change-Id: Ifcd7a0c715c3fd9070a4c58208612a626382de35 Signed-off-by: Shawn O. Pearce <sop@google.com>
Diffstat (limited to 'subcmds/upload.py')
-rw-r--r--subcmds/upload.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/subcmds/upload.py b/subcmds/upload.py
index b47b37b8..153b3ebe 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -262,7 +262,7 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
262 except: 262 except:
263 return "" 263 return ""
264 264
265 def _ReplaceBranch(self, project, people): 265 def _ReplaceBranch(self, opt, project, people):
266 branch = project.CurrentBranch 266 branch = project.CurrentBranch
267 if not branch: 267 if not branch:
268 print >>sys.stdout, "no branches ready for upload" 268 print >>sys.stdout, "no branches ready for upload"
@@ -388,7 +388,7 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
388 print >>sys.stderr, \ 388 print >>sys.stderr, \
389 'error: --replace requires exactly one project' 389 'error: --replace requires exactly one project'
390 sys.exit(1) 390 sys.exit(1)
391 self._ReplaceBranch(project_list[0], people) 391 self._ReplaceBranch(opt, project_list[0], people)
392 return 392 return
393 393
394 for project in project_list: 394 for project in project_list: