Skip to content

Commit

Permalink
Default deploy-branch base to origin/master
Browse files Browse the repository at this point in the history
Summary: I never use my local master branch now, so it's always the wrong base to use. origin/master is actually what I want.

Test Plan: Made a deploy branch with no problems.

Reviewers: csilvers

Reviewed By: csilvers

Subscribers: jessie

Differential Revision: http://phabricator.khanacademy.org/D12936
  • Loading branch information
sophiebits committed Sep 6, 2014
1 parent d82e9b2 commit ee59c40
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions bin/git-deploy-branch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

USAGE=`cat<<EOF
USAGE: git deploy-branch <branchname> [parent -- defaults to master]
USAGE: git deploy-branch <branchname> [parent -- defaults to origin/master]
Creates a remote deploy branch for use with GitHub-style deploys.
Expand All @@ -26,7 +26,7 @@ if git show-ref --quiet --verify refs/remotes/origin/$1; then
echo "WARNING: using already existing branch origin/$1"
else
# Create a new branch tracking the remote one
git branch --no-track $1 ${2-master} && \
git branch --no-track $1 ${2-origin/master} && \
git co $1 && \
git push --set-upstream origin $1
fi

0 comments on commit ee59c40

Please sign in to comment.