diff options
author | David Pursehouse <dpursehouse@collab.net> | 2018-11-14 19:01:22 -0800 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2019-05-15 10:59:53 +0200 |
commit | f25a370a14efc6f849d79bbee927c9b20a0dc41c (patch) | |
tree | a90d9afbba7a996784c85bc05eaeb504386ef758 | |
parent | 2d095da4f19ec20f56fa8e02bb2012b156d8ee1a (diff) | |
download | git-repo-f25a370a14efc6f849d79bbee927c9b20a0dc41c.tar.gz |
Use %topic=topic instead of deprecated /topic syntax on push
Bug: https://crbug.com/gerrit/9930
Change-Id: Iefa202d42ef6e6b8b2b1a3f9b8baa5f0d65cbd60
-rwxr-xr-x | project.py | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1172,10 +1172,11 @@ class Project(object): | |||
1172 | 1172 | ||
1173 | ref_spec = '%s:refs/%s/%s' % (R_HEADS + branch.name, upload_type, | 1173 | ref_spec = '%s:refs/%s/%s' % (R_HEADS + branch.name, upload_type, |
1174 | dest_branch) | 1174 | dest_branch) |
1175 | opts = [] | ||
1175 | if auto_topic: | 1176 | if auto_topic: |
1176 | ref_spec = ref_spec + '/' + branch.name | 1177 | opts += ['topic=' + branch.name] |
1177 | 1178 | ||
1178 | opts = ['r=%s' % p for p in people[0]] | 1179 | opts += ['r=%s' % p for p in people[0]] |
1179 | opts += ['cc=%s' % p for p in people[1]] | 1180 | opts += ['cc=%s' % p for p in people[1]] |
1180 | if notify: | 1181 | if notify: |
1181 | opts += ['notify=' + notify] | 1182 | opts += ['notify=' + notify] |