summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-02-15 14:24:20 +0100
committerFlorian Bruhin <me@the-compiler.org>2020-04-03 14:35:40 +0200
commit5d4c081174da44491bb52328f47c8e4d62a1be5c (patch)
tree0965f977642e32b8eac4ef8c6706377116a40b82
parent7fef6a9c8080dbb6b2123f14614606bfe95005fa (diff)
downloadqutebrowser-5d4c081174da44491bb52328f47c8e4d62a1be5c.tar.gz
qutebrowser-5d4c081174da44491bb52328f47c8e4d62a1be5c.zip
Improve git instructions printed by update_version.py
(cherry picked from commit 73eb3f5d6a761a16bd353c5e789a211566e90417)
-rw-r--r--scripts/dev/update_version.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/dev/update_version.py b/scripts/dev/update_version.py
index 89f7e4218..f6cc2c27b 100644
--- a/scripts/dev/update_version.py
+++ b/scripts/dev/update_version.py
@@ -69,19 +69,19 @@ if __name__ == "__main__":
print("* git checkout master && git cherry-pick v{v} && "
"git push origin".format(v=version))
else:
- print("* git branch v{x} v{v} && git push origin v{x}"
+ print("* git branch v{x} v{v} && git push --set-upstream origin v{x}"
.format(v=version, x=x_version))
print("* Create new release via GitHub (required to upload release "
"artifacts)")
- print("* Linux: git pull && git checkout v{v} && "
+ print("* Linux: git fetch && git checkout v{v} && "
"./.venv/bin/python3 scripts/dev/build_release.py --upload"
.format(v=version))
- print("* Windows: git pull; git checkout v{v}; "
+ print("* Windows: git fetch; git checkout v{v}; "
"py -3 scripts\\dev\\build_release.py --asciidoc "
"C:\\Python27\\python "
"$env:userprofile\\bin\\asciidoc-8.6.10\\asciidoc.py --upload"
.format(v=version))
- print("* macOS: git pull && git checkout v{v} && "
+ print("* macOS: git fetch && git checkout v{v} && "
"python3 scripts/dev/build_release.py --upload"
.format(v=version))