Replaced all old-style flag variables by shFlags-style flag variables.
This commit is contained in:
parent
d099126fe5
commit
ca73caf8c5
4 changed files with 11 additions and 9 deletions
|
@ -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 "$@"
|
||||
|
|
|
@ -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,6 +113,7 @@ 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
|
||||
|
@ -121,7 +121,7 @@ cmd_start() {
|
|||
|
||||
# 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
|
||||
|
|
|
@ -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,6 +119,7 @@ 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
|
||||
|
@ -127,7 +127,7 @@ cmd_start() {
|
|||
|
||||
# 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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue