Replace gitflow_check_ prefixes by gitflow_require_ prefixes, for con…

…sistency.
DevlinSchoonraad · Jan 29, 2010 · 4838644 · 4838644
1 parent 278884b
commit 4838644
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/git-flow b/git-flow
@@ -83,7 +83,7 @@ main() {
 	cmd_$SUBACTION "$@"
 }
 
-gitflow_check_clean_working_tree() {
+gitflow_require_clean_working_tree() {
 	if ! git diff --no-ext-diff --ignore-submodules --quiet --exit-code; then
 		die "Working tree contains unstaged changes. Aborting ..."
 	fi

diff --git a/git-flow-feature b/git-flow-feature
@@ -69,7 +69,7 @@ cmd_start() {
 	parse_args "$@"
 
 	# sanity checks
-	gitflow_check_clean_working_tree
+	gitflow_require_clean_working_tree
 	gitflow_require_branch_absent $BRANCH
 	if [ "$BASE" = "$DEVELOP_BRANCH" ]; then
 		git fetch -q $ORIGIN $DEVELOP_BRANCH
@@ -94,7 +94,7 @@ cmd_finish() {
 	parse_args "$@"
 
 	# sanity checks
-	gitflow_check_clean_working_tree
+	gitflow_require_clean_working_tree
 	gitflow_require_branch $BRANCH
 	git fetch -q $ORIGIN
 	if has $ORIGIN/$BRANCH $REMOTE_BRANCHES; then
@@ -130,7 +130,7 @@ cmd_publish() {
 	parse_args "$@"
 
 	# sanity checks
-	gitflow_check_clean_working_tree
+	gitflow_require_clean_working_tree
 	gitflow_require_branch $BRANCH
 	git fetch -q $ORIGIN
 	gitflow_require_branch_absent $ORIGIN/$BRANCH
@@ -156,7 +156,7 @@ cmd_track() {
 	parse_args "$@"
 
 	# sanity checks
-	gitflow_check_clean_working_tree
+	gitflow_require_clean_working_tree
 	gitflow_require_branch_absent $BRANCH
 	git fetch -q $ORIGIN
 	gitflow_require_branch $ORIGIN/$BRANCH

diff --git a/git-flow-hotfix b/git-flow-hotfix
@@ -63,7 +63,7 @@ cmd_start() {
 	parse_args "$@"
 
 	# sanity checks
-	gitflow_check_clean_working_tree
+	gitflow_require_clean_working_tree
 	git fetch -q $ORIGIN
 	gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
 	gitflow_require_branch_absent $BRANCH
@@ -89,7 +89,7 @@ cmd_finish() {
 	parse_args "$@"
 
 	# sanity checks
-	gitflow_check_clean_working_tree
+	gitflow_require_clean_working_tree
 	git fetch -q $ORIGIN $MASTER_BRANCH
 	git fetch -q $ORIGIN $DEVELOP_BRANCH
 	gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH

diff --git a/git-flow-init b/git-flow-init
@@ -40,7 +40,7 @@ cmd_default() {
 		die "Cannot find your master branch. Try: git branch -m <mymaster> $MASTER_BRANCH"
 	fi
 
-	gitflow_check_clean_working_tree
+	gitflow_require_clean_working_tree
 
 	if git remote | grep -q $ORIGIN; then
 		git fetch -q $ORIGIN

diff --git a/git-flow-release b/git-flow-release
@@ -64,7 +64,7 @@ cmd_start() {
 	parse_args "$@"
 
 	# sanity checks
-	gitflow_check_clean_working_tree
+	gitflow_require_clean_working_tree
 	git fetch -q $ORIGIN
 	gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
 	gitflow_require_branch_absent $BRANCH
@@ -90,7 +90,7 @@ cmd_finish() {
 	parse_args "$@"
 
 	# sanity checks
-	gitflow_check_clean_working_tree
+	gitflow_require_clean_working_tree
 	git fetch -q $ORIGIN
 	gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
 	gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH

diff --git a/git-flow-support b/git-flow-support
@@ -53,7 +53,7 @@ cmd_start() {
 	parse_args "$@"
 
 	# sanity checks
-	gitflow_check_clean_working_tree
+	gitflow_require_clean_working_tree
 
 	# create branch
 	git checkout -b $BRANCH $BASE