Fix: unnecessary requirement of origin when creating a new feature br…

…anch. Only test if local branch is behind origin if origin exists.
ddcjackm · Apr 4, 2010 · c118a85 · c118a85
1 parent d79a0d4
commit c118a85
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/git-flow-feature b/git-flow-feature
@@ -182,7 +182,11 @@ cmd_start() {
 		git fetch -q "$ORIGIN" "$DEVELOP_BRANCH"
 	fi
 
-	require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
+	# if the origin branch counterpart exists, assert that the local branch
+	# isn't behind it (to avoid unnecessary rebasing)
+	if git_branch_exists "$ORIGIN/$DEVELOP_BRANCH"; then
+		require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
+	fi
 
 	# create branch
 	if ! git checkout -b "$BRANCH" "$BASE"; then