summaryrefslogtreecommitdiffstats
path: root/subcmds/upload.py
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2014-01-10 01:20:12 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-01-10 01:20:13 +0000
commite695338e21080d3cbe20935db572e4cd0c7a620c (patch)
treecc525f53929fa4ea24f108d24545c68c7c6cb5ba /subcmds/upload.py
parentbd80f7eedd5a74f6c5fad745091dcda53a6415bf (diff)
parent8d20116038ff78b22069dd4e993b5819775f03d1 (diff)
downloadgit-repo-e695338e21080d3cbe20935db572e4cd0c7a620c.tar.gz
Merge "repo: Support multiple branches for the same project."
Diffstat (limited to 'subcmds/upload.py')
-rw-r--r--subcmds/upload.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/subcmds/upload.py b/subcmds/upload.py
index 7f7585ae..56212408 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -432,8 +432,10 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
432 hook = RepoHook('pre-upload', self.manifest.repo_hooks_project, 432 hook = RepoHook('pre-upload', self.manifest.repo_hooks_project,
433 self.manifest.topdir, abort_if_user_denies=True) 433 self.manifest.topdir, abort_if_user_denies=True)
434 pending_proj_names = [project.name for (project, avail) in pending] 434 pending_proj_names = [project.name for (project, avail) in pending]
435 pending_worktrees = [project.worktree for (project, avail) in pending]
435 try: 436 try:
436 hook.Run(opt.allow_all_hooks, project_list=pending_proj_names) 437 hook.Run(opt.allow_all_hooks, project_list=pending_proj_names,
438 worktree_list=pending_worktrees)
437 except HookError as e: 439 except HookError as e:
438 print("ERROR: %s" % str(e), file=sys.stderr) 440 print("ERROR: %s" % str(e), file=sys.stderr)
439 return 441 return