commit 0968570df26f05d26ab566d9effbc8efad06ce80
author Jonathan Nieder <jrn@google.com> Thu May 16 23:05:53 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 16 23:05:53 2019 +0000
tree b626407b44e5af880287f039771f5f869afaa4d0
parent f25a370a14efc6f849d79bbee927c9b20a0dc41c
parent b554838ce83d1af6b2f27ae07d5f5732d03c8fdf

Merge "Print project name when work tree initialization fails"

project.py

diff --git a/project.py b/project.py
index 83d2f6a..de35a60 100755
--- a/project.py
+++ b/project.py
@@ -1172,10 +1172,11 @@
 
     ref_spec = '%s:refs/%s/%s' % (R_HEADS + branch.name, upload_type,
                                   dest_branch)
+    opts = []
     if auto_topic:
-      ref_spec = ref_spec + '/' + branch.name
+      opts += ['topic=' + branch.name]
 
-    opts = ['r=%s' % p for p in people[0]]
+    opts += ['r=%s' % p for p in people[0]]
     opts += ['cc=%s' % p for p in people[1]]
     if notify:
       opts += ['notify=' + notify]