Cut release branch from master, warn when master != upstream/master. #76

busunkim96 · 2018-10-09T00:04:48Z

Closes #66

Release branch is cut from master instead of origin/master
Releasetool checks that master is up to date with the upstream master branch.

/ Hey, busunkim, let's release some stuff!
> Determining GitHub context.
Origin: busunkim96/google-cloud-python, Upstream: GoogleCloudPlatform/google-cloud-python
> Comparing upstream/master to master.
master is up to date with upstream/master
...

o/ Hey, busunkim, let's release some stuff!
> Determining GitHub context.
Origin: busunkim96/google-cloud-python, Upstream: GoogleCloudPlatform/google-cloud-python
> Comparing upstream/master to master.
WARNING: master is not up to date with upstream/master
> Would you like to continue? [y/N]: y
...

tseaver

LGTM

releasetool/commands/common.py

+    # Compare upstream/master with master
+    click.secho(f"> Comparing {ctx.upstream_name}/master to master.", fg="cyan")
+
+    if releasetool.git.diff(f"{ctx.upstream_name}/master", "master") == "":


Cut release branch from master, warn when master != upstream/master.

c8b8ce1

busunkim96 requested a review from theacodes October 9, 2018 00:04

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Oct 9, 2018

tseaver reviewed Oct 9, 2018

View reviewed changes

theacodes reviewed Oct 9, 2018

View reviewed changes

releasetool/commands/common.py Outdated

# Compare upstream/master with master

click.secho(f"> Comparing {ctx.upstream_name}/master to master.", fg="cyan")

if releasetool.git.diff(f"{ctx.upstream_name}/master", "master") == "":

This comment was marked as spam.

Sign in to view

Compare branches with SHA

0ed2d12

theacodes approved these changes Oct 9, 2018

View reviewed changes

theacodes merged commit d049a66 into googleapis:master Oct 9, 2018

busunkim96 deleted the change-base-branch branch October 9, 2018 20:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cut release branch from master, warn when master != upstream/master. #76

Cut release branch from master, warn when master != upstream/master. #76

busunkim96 commented Oct 9, 2018

tseaver left a comment

This comment was marked as spam.

Cut release branch from master, warn when master != upstream/master. #76

Cut release branch from master, warn when master != upstream/master. #76

Conversation

busunkim96 commented Oct 9, 2018

tseaver left a comment

Choose a reason for hiding this comment

This comment was marked as spam.