Skip to content

Commit

Permalink
Rename the helper function.
Browse files Browse the repository at this point in the history
  • Loading branch information
nvie committed Oct 5, 2010
1 parent 4d8239a commit d256bbf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git-flow-release
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ require_no_existing_release_branches() {
die "There is an existing release branch ($first_branch). Finish that one first."
}

require_not_being_in_release_branch() {
require_not_on_release_branch() {
if [ "$BRANCH" = "$(git_current_branch)"]; then
die "You cannot be in the '$BRANCH' branch when you finish it."
fi
Expand Down Expand Up @@ -209,7 +209,7 @@ cmd_finish() {
# sanity checks
require_branch "$BRANCH"
require_clean_working_tree
require_not_being_in_release_branch
require_not_on_release_branch
if flag fetch; then
git fetch -q "$ORIGIN" "$MASTER_BRANCH" || \
die "Could not fetch $MASTER_BRANCH from $ORIGIN."
Expand Down

0 comments on commit d256bbf

Please sign in to comment.