summaryrefslogtreecommitdiff
path: root/git_review
diff options
context:
space:
mode:
authorHannu Hartikainen <hannu.hartikainen@gmail.com>2019-03-29 10:47:12 +0200
committerHannu Hartikainen <hannu.hartikainen@gmail.com>2019-03-29 12:28:06 +0200
commit98cc896bc273ad0e95d2035d48187ebddb179521 (patch)
tree20da2f81ccb620eaabab27c74baf97e830a85a18 /git_review
parent853f3bffb31efd3e5141b538e99713ee414e0002 (diff)
downloadgit-review-98cc896bc273ad0e95d2035d48187ebddb179521.tar.gz
Push with --no-follow-tags
When the git configuration value push.followTags is set and a repo has tags, git-review pushes are rejected: ! [remote rejected] TAG -> TAG (cannot combine normal pushes and magic pushes) This change ensures that git-review never pushes with followTags. Change-Id: Ifbd13284b16bad1165e73d25b99f17344180d423
Diffstat (limited to 'git_review')
-rw-r--r--git_review/cmd.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/git_review/cmd.py b/git_review/cmd.py
index b248b46..bba5a56 100644
--- a/git_review/cmd.py
+++ b/git_review/cmd.py
@@ -1643,7 +1643,8 @@ def _main():
if options.custom_script:
run_custom_script("draft")
- cmd = "git push %s HEAD:refs/%s/%s" % (remote, ref, branch)
+ cmd = ("git push --no-follow-tags %s HEAD:refs/%s/%s" %
+ (remote, ref, branch))
push_options = []
if options.topic is not None:
topic = options.topic