From f25a370a14efc6f849d79bbee927c9b20a0dc41c Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Wed, 14 Nov 2018 19:01:22 -0800
Subject: [PATCH] Use %topic=topic instead of deprecated /topic syntax on push

Bug: https://crbug.com/gerrit/9930
Change-Id: Iefa202d42ef6e6b8b2b1a3f9b8baa5f0d65cbd60
---
 project.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/project.py b/project.py
index 65bc3a04..bcf1a46d 100755
--- a/project.py
+++ b/project.py
@@ -1172,10 +1172,11 @@ class Project(object):
 
     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]