Skip to content

G
gitflow
Commit ca73caf8 authored by Vincent Driessen's avatar Vincent Driessen
Browse files
Options

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

parent d099126f
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 9 deletions
git-flow-feature
View file @ ca73caf8
...@@ -174,7 +174,7 @@ cmd_start() { ...@@ -174,7 +174,7 @@ cmd_start() {
} }
cmd_finish() { 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 rebase false 'rebase instead of merge' r
DEFINE_boolean squash false 'squash all commits when rebasing (implies --rebase)' s DEFINE_boolean squash false 'squash all commits when rebasing (implies --rebase)' s
parse_args "$@" parse_args "$@"
......
git-flow-hotfix
View file @ ca73caf8
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag) VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag)
PREFIX=$(git config --get gitflow.prefix.hotfix || echo hotfix/) PREFIX=$(git config --get gitflow.prefix.hotfix || echo hotfix/)
FLAG_FETCH=1
usage() { usage() {
echo "usage: git flow hotfix [list] [-v]" echo "usage: git flow hotfix [list] [-v]"
...@@ -114,6 +113,7 @@ require_base_is_on_master() { ...@@ -114,6 +113,7 @@ require_base_is_on_master() {
} }
cmd_start() { cmd_start() {
DEFINE_boolean fetch true "fetch from $ORIGIN before finishing hotfix" F
parse_args "$@" parse_args "$@"
BASE="${2:-$MASTER_BRANCH}" BASE="${2:-$MASTER_BRANCH}"
require_version_arg require_version_arg
...@@ -121,7 +121,7 @@ cmd_start() { ...@@ -121,7 +121,7 @@ cmd_start() {
# sanity checks # sanity checks
gitflow_require_clean_working_tree 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 $MASTER_BRANCH
fi fi
gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
...@@ -145,12 +145,13 @@ cmd_start() { ...@@ -145,12 +145,13 @@ cmd_start() {
} }
cmd_finish() { cmd_finish() {
DEFINE_boolean fetch true "fetch from $ORIGIN before finishing hotfix" F
parse_args "$@" parse_args "$@"
require_version_arg require_version_arg
# sanity checks # sanity checks
gitflow_require_clean_working_tree 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 $MASTER_BRANCH
git fetch -q $ORIGIN $DEVELOP_BRANCH git fetch -q $ORIGIN $DEVELOP_BRANCH
fi fi
......
git-flow-release
View file @ ca73caf8
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag) VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag)
PREFIX=$(git config --get gitflow.prefix.release || echo release/) PREFIX=$(git config --get gitflow.prefix.release || echo release/)
FLAG_FETCH=1
usage() { usage() {
echo "usage: git flow release [list] [-v]" echo "usage: git flow release [list] [-v]"
...@@ -120,6 +119,7 @@ require_base_is_on_develop() { ...@@ -120,6 +119,7 @@ require_base_is_on_develop() {
} }
cmd_start() { cmd_start() {
DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
parse_args "$@" parse_args "$@"
BASE="${2:-$DEVELOP_BRANCH}" BASE="${2:-$DEVELOP_BRANCH}"
require_version_arg require_version_arg
...@@ -127,7 +127,7 @@ cmd_start() { ...@@ -127,7 +127,7 @@ cmd_start() {
# sanity checks # sanity checks
gitflow_require_clean_working_tree gitflow_require_clean_working_tree
if [ $FLAG_FETCH -eq 1 ]; then if flag fetch; then
git fetch -q $ORIGIN $DEVELOP_BRANCH git fetch -q $ORIGIN $DEVELOP_BRANCH
fi fi
gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
...@@ -151,12 +151,13 @@ cmd_start() { ...@@ -151,12 +151,13 @@ cmd_start() {
} }
cmd_finish() { cmd_finish() {
DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
parse_args "$@" parse_args "$@"
require_version_arg require_version_arg
# sanity checks # sanity checks
gitflow_require_clean_working_tree 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 $MASTER_BRANCH
git fetch -q $ORIGIN $DEVELOP_BRANCH git fetch -q $ORIGIN $DEVELOP_BRANCH
fi fi
......
git-flow-support
View file @ ca73caf8
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag) VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag)
PREFIX=$(git config --get gitflow.prefix.support || echo support/) PREFIX=$(git config --get gitflow.prefix.support || echo support/)
FLAG_FETCH=1
warn "note: The support subcommand is still very EXPERIMENTAL!" warn "note: The support subcommand is still very EXPERIMENTAL!"
warn "note: DO NOT use it in a production situation." warn "note: DO NOT use it in a production situation."
...@@ -125,6 +124,7 @@ require_base_is_on_master() { ...@@ -125,6 +124,7 @@ require_base_is_on_master() {
} }
cmd_start() { cmd_start() {
DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
parse_args "$@" parse_args "$@"
require_version_arg require_version_arg
require_base_arg require_base_arg
...@@ -134,7 +134,7 @@ cmd_start() { ...@@ -134,7 +134,7 @@ cmd_start() {
gitflow_require_clean_working_tree gitflow_require_clean_working_tree
# fetch remote changes # fetch remote changes
if [ $FLAG_FETCH -eq 1 ]; then if flag fetch; then
git fetch -q $ORIGIN $BASE git fetch -q $ORIGIN $BASE
fi fi
gitflow_require_branch_absent $BRANCH gitflow_require_branch_absent $BRANCH
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment