Merge pull request #2768 from aanand/fix-make-branch

Fixes to make-branch script

script/release/make-branch

@@ -63,15 +63,17 @@ git merge --strategy=ours --no-edit $REMOTE/release
 git config "branch.${BRANCH}.release" $VERSION
 
 
+editor=${EDITOR:-vim}
+
 echo "Update versions in docs/install.md, compose/__init__.py, script/run.sh"
-$EDITOR docs/install.md
-$EDITOR compose/__init__.py
-$EDITOR script/run.sh
+$editor docs/install.md
+$editor compose/__init__.py
+$editor script/run.sh
 
 
 echo "Write release notes in CHANGELOG.md"
 browser "https://github.com/docker/compose/issues?q=milestone%3A$VERSION+is%3Aclosed"
-$EDITOR CHANGELOG.md
+$editor CHANGELOG.md
 
 
 git diff
@@ -84,10 +86,10 @@ echo "Push branch to user remote"
 GITHUB_USER=$USER
 USER_REMOTE="$(find_remote $GITHUB_USER/compose)"
 if [ -z "$USER_REMOTE" ]; then
-    echo "No user remote found for $GITHUB_USER"
-    read -r -p "Enter the name of your github user: " GITHUB_USER
+    echo "$GITHUB_USER/compose not found"
+    read -r -p "Enter the name of your GitHub fork (username/repo): " GITHUB_REPO
     # assumes there is already a user remote somewhere
-    USER_REMOTE=$(find_remote $GITHUB_USER/compose)
+    USER_REMOTE=$(find_remote $GITHUB_REPO)
 fi
 if [ -z "$USER_REMOTE" ]; then
     >&2 echo "No user remote found. You need to 'git push' your branch."