Browse files

Added function gitflow_require_initialized(), to assert that the gitflow

variables are all set (they need to be set explicitly once).
  • Loading branch information...
1 parent 1d8bb0d commit c1598bf2cf8e27e556240e728a9d389b4299e67c @nvie committed Feb 20, 2010
Showing with 17 additions and 7 deletions.
  1. +2 −1 git-flow-feature
  2. +2 −1 git-flow-hotfix
  3. +2 −1 git-flow-release
  4. +2 −1 git-flow-support
  5. +9 −3 gitflow-common
View
3 git-flow-feature
@@ -13,8 +13,9 @@
#
gitflow_require_git_repo
+gitflow_require_initialized
gitflow_load_settings
-PREFIX=$(git config --get gitflow.prefix.feature || echo feature/)
+PREFIX=$(git config --get gitflow.prefix.feature)
usage() {
echo "usage: git flow feature [list] [-v]"
View
3 git-flow-hotfix
@@ -13,9 +13,10 @@
#
gitflow_require_git_repo
+gitflow_require_initialized
gitflow_load_settings
VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag)
-PREFIX=$(git config --get gitflow.prefix.hotfix || echo hotfix/)
+PREFIX=$(git config --get gitflow.prefix.hotfix)
usage() {
echo "usage: git flow hotfix [list] [-v]"
View
3 git-flow-release
@@ -13,9 +13,10 @@
#
gitflow_require_git_repo
+gitflow_require_initialized
gitflow_load_settings
VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag)
-PREFIX=$(git config --get gitflow.prefix.release || echo release/)
+PREFIX=$(git config --get gitflow.prefix.release)
usage() {
echo "usage: git flow release [list] [-v]"
View
3 git-flow-support
@@ -13,9 +13,10 @@
#
gitflow_require_git_repo
+gitflow_require_initialized
gitflow_load_settings
VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag)
-PREFIX=$(git config --get gitflow.prefix.support || echo support/)
+PREFIX=$(git config --get gitflow.prefix.support)
warn "note: The support subcommand is still very EXPERIMENTAL!"
warn "note: DO NOT use it in a production situation."
View
12 gitflow-common
@@ -74,8 +74,8 @@ gitflow_all_tags() { git tag; }
# loading settings that can be overridden using git config
gitflow_load_settings() {
export DOT_GIT_DIR=$(git rev-parse --git-dir >/dev/null 2>&1)
- export MASTER_BRANCH=$(git config --get gitflow.branch.master || echo master)
- export DEVELOP_BRANCH=$(git config --get gitflow.branch.develop || echo develop)
+ export MASTER_BRANCH=$(git config --get gitflow.branch.master)
+ export DEVELOP_BRANCH=$(git config --get gitflow.branch.develop)
export ORIGIN=$(git config --get gitflow.origin || echo origin)
}
@@ -144,7 +144,13 @@ gitflow_test_clean_working_tree() {
gitflow_require_git_repo() {
if ! git rev-parse --git-dir >/dev/null 2>&1; then
- die "Not a git repository"
+ die "fatal: Not a git repository"
+ fi
+}
+
+gitflow_require_initialized() {
+ if ! gitflow_is_initialized; then
+ die "fatal: Not a gitflow-enabled repo yet. Please run \"git flow init\" first."
fi
}

0 comments on commit c1598bf

Please sign in to comment.