Merge branch 'develop' of https://github.com/jezdez/gitflow into develop

499b4682 · Vincent Driessen · 2f05c3c8 · 8f280e0b · 499b4682
Commit 499b4682 authored Apr 17, 2011 by Vincent Driessen
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

gitflow-common gitflow-common +5 -3

No files found.
--- a/gitflow-common
+++ b/gitflow-common
@@ -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() {