Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/jezdez/gitflow into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
nvie committed Apr 17, 2011
2 parents 2f05c3c + 8f280e0 commit 499b468
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions gitflow-common
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,11 @@ require_branch_absent() {
}

require_tag_absent() {
if has $1 $(git_all_tags); then
die "Tag '$1' already exists. Pick another name."
fi
for tag in $(git_all_tags); do
if [ "$1" = "$tag" ]; then
die "Tag '$1' already exists. Pick another name."
fi
done
}

require_branches_equal() {
Expand Down

0 comments on commit 499b468

Please sign in to comment.