Skip to content
Browse files

Replaced all old-style flag variables by shFlags-style flag variables.

  • Loading branch information...
1 parent d099126 commit ca73caf8c5d8d2eab325ede3e1bd17fa127db91d @nvie committed Feb 7, 2010
Showing with 11 additions and 9 deletions.
  1. +1 −1 git-flow-feature
  2. +4 −3 git-flow-hotfix
  3. +4 −3 git-flow-release
  4. +2 −2 git-flow-support
View
2 git-flow-feature
@@ -174,7 +174,7 @@ cmd_start() {
}
cmd_finish() {
- DEFINE_boolean fetch false 'fetch from origin before performing local operation' F
+ DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
DEFINE_boolean rebase false 'rebase instead of merge' r
DEFINE_boolean squash false 'squash all commits when rebasing (implies --rebase)' s
parse_args "$@"
View
7 git-flow-hotfix
@@ -14,7 +14,6 @@
VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag)
PREFIX=$(git config --get gitflow.prefix.hotfix || echo hotfix/)
-FLAG_FETCH=1
usage() {
echo "usage: git flow hotfix [list] [-v]"
@@ -114,14 +113,15 @@ require_base_is_on_master() {
}
cmd_start() {
+ DEFINE_boolean fetch true "fetch from $ORIGIN before finishing hotfix" F
parse_args "$@"
BASE="${2:-$MASTER_BRANCH}"
require_version_arg
require_base_is_on_master
# sanity checks
gitflow_require_clean_working_tree
- if [ $FLAG_FETCH -eq 1 ]; then
+ if flag fetch; then
git fetch -q $ORIGIN $MASTER_BRANCH
fi
gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
@@ -145,12 +145,13 @@ cmd_start() {
}
cmd_finish() {
+ DEFINE_boolean fetch true "fetch from $ORIGIN before finishing hotfix" F
parse_args "$@"
require_version_arg
# sanity checks
gitflow_require_clean_working_tree
- if [ $FLAG_FETCH -eq 1 ]; then
+ if flag fetch; then
git fetch -q $ORIGIN $MASTER_BRANCH
git fetch -q $ORIGIN $DEVELOP_BRANCH
fi
View
7 git-flow-release
@@ -14,7 +14,6 @@
VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag)
PREFIX=$(git config --get gitflow.prefix.release || echo release/)
-FLAG_FETCH=1
usage() {
echo "usage: git flow release [list] [-v]"
@@ -120,14 +119,15 @@ require_base_is_on_develop() {
}
cmd_start() {
+ DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
parse_args "$@"
BASE="${2:-$DEVELOP_BRANCH}"
require_version_arg
require_base_is_on_develop
# sanity checks
gitflow_require_clean_working_tree
- if [ $FLAG_FETCH -eq 1 ]; then
+ if flag fetch; then
git fetch -q $ORIGIN $DEVELOP_BRANCH
fi
gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
@@ -151,12 +151,13 @@ cmd_start() {
}
cmd_finish() {
+ DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
parse_args "$@"
require_version_arg
# sanity checks
gitflow_require_clean_working_tree
- if [ $FLAG_FETCH -eq 1 ]; then
+ if flag fetch; then
git fetch -q $ORIGIN $MASTER_BRANCH
git fetch -q $ORIGIN $DEVELOP_BRANCH
fi
View
4 git-flow-support
@@ -14,7 +14,6 @@
VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag)
PREFIX=$(git config --get gitflow.prefix.support || echo support/)
-FLAG_FETCH=1
warn "note: The support subcommand is still very EXPERIMENTAL!"
warn "note: DO NOT use it in a production situation."
@@ -125,6 +124,7 @@ require_base_is_on_master() {
}
cmd_start() {
+ DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
parse_args "$@"
require_version_arg
require_base_arg
@@ -134,7 +134,7 @@ cmd_start() {
gitflow_require_clean_working_tree
# fetch remote changes
- if [ $FLAG_FETCH -eq 1 ]; then
+ if flag fetch; then
git fetch -q $ORIGIN $BASE
fi
gitflow_require_branch_absent $BRANCH

0 comments on commit ca73caf

Please sign in to comment.
Something went wrong with that request. Please try again.