Skip to content

Commit

Permalink
git checkbuild now publishes any changes from the given branch
Browse files Browse the repository at this point in the history
This should avoid branches not turning up when testing is started on them
and also avoid partial branches being tested when further updates weren't
pushed to the remote.
Refs #8474
  • Loading branch information
martyngigg committed Nov 19, 2013
1 parent a21e831 commit 12ca1d7
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions Code/Tools/Workflow/git/git-checkbuild
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,13 @@ start_on_feature() {
# We're starting again so clear out previous saved setting
remove_config_value ${MERGENAME_CFG_KEY}

# No need to be careful about the state of develop so kill the local branch and recreate it
# First publish the changes on the branch so that is is visible publicly
mergebranch=$(current_branch)
echo "Starting from branch ${mergebranch}."
echo "Publishing branch '${mergebranch}'"
git_halt_on_error push origin ${mergebranch}

# Now do the merge. No need to be careful about the state of develop
# so kill the local branch and recreate it
local_branch_exists ${BUILD_BRANCH}
if [ $? -eq 1 ]; then
echo "Deleting local copy of ${BUILD_BRANCH}"
Expand All @@ -97,7 +100,7 @@ start_on_feature() {
remove_config_value ${MERGENAME_CFG_KEY}
fi

# Publish
# Publish changes to develop
git_ignore_errors push origin ${BUILD_BRANCH}
if [ $? -gt 0 ]; then
echo "Could not push to remote. The remote ${BUILD_BRANCH} was probably recreated. Rerun this command to recreate local ${BUILD_BRANCH}"
Expand Down

0 comments on commit 12ca1d7

Please sign in to comment.