Skip to content

Skip upstream merge if no changes

Luke Bennett requested to merge skip-upstream-merge-if-no-changes into master 
gitlab/release-tools - [master] » TEST=true bundle exec rake upstream_merge
Prepare repository...
Pushes will be ignored because of TEST env
Removing /tmp/gitlab-ee...
[2018-01-13 17:13:32 +0000] [/Users/jared/workspace/gitlab/release-tools] git clone --quiet --depth=200 --origin origin git@gitlab.com:gitlab-org/gitlab-ee.git /tmp/gitlab-ee
[2018-01-13 17:15:04 +0000] [/private/tmp/gitlab-ee] git remote add upstream git@gitlab.com:gitlab-org/gitlab-ce.git
[2018-01-13 17:15:04 +0000] [/private/tmp/gitlab-ee] git fetch --quiet --depth=200 origin master:master
[2018-01-13 17:15:07 +0000] [/private/tmp/gitlab-ee] git fetch --quiet --depth=200 origin master
[2018-01-13 17:15:11 +0000] [/private/tmp/gitlab-ee] git checkout --quiet -b ce-to-ee-2018-01-13 master
[2018-01-13 17:15:15 +0000] [/private/tmp/gitlab-ee] git fetch --quiet --depth=200 upstream master:master
[2018-01-13 17:15:31 +0000] [/private/tmp/gitlab-ee] git fetch --quiet --depth=200 upstream master
[2018-01-13 17:15:36 +0000] [/private/tmp/gitlab-ee] git merge --quiet --no-edit --no-ff upstream/master ce-to-ee-2018-01-13
[2018-01-13 17:15:37 +0000] [/private/tmp/gitlab-ee] git status --short
Removing /tmp/gitlab-ee...
--> No changes since last upstream merge.  Merge request "CE upstream - Saturday" not created.

Merge request reports