tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing merge for release branch. 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-10-14 15:20:57 -04:00
parent b2f9c182f3
commit 284cda087e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
script/release/make-branch
View File

@ -39,7 +39,7 @@ fi
DEFAULT_REMOTE=release DEFAULT_REMOTE=release
REMOTE="$(find_remote "$GITHUB_REPO")" REMOTE="$(find_remote "$GITHUB_REPO")"
# If we don't have a docker origin add one # If we don't have a docker remote add one
if [ -z "$REMOTE" ]; then if [ -z "$REMOTE" ]; then
echo "Creating $DEFAULT_REMOTE remote" echo "Creating $DEFAULT_REMOTE remote"
git remote add ${DEFAULT_REMOTE} ${GITHUB_REPO} git remote add ${DEFAULT_REMOTE} ${GITHUB_REPO}
@ -55,6 +55,8 @@ read -n1 -r -p "Continue? (ctrl+c to cancel)"
git fetch $REMOTE -p git fetch $REMOTE -p
git checkout -b $BRANCH $BASE_VERSION git checkout -b $BRANCH $BASE_VERSION
echo "Merging remote release branch into new release branch"
git merge --strategy=ours --no-edit $REMOTE/release
# Store the release version for this branch in git, so that other release # Store the release version for this branch in git, so that other release
# scripts can use it # scripts can use it