Skip to content
Browse files

push option defaultをtrueに修正. hotfix,releaseにてpush option指定時にremote br…

…anchを削除するように修正. featureにてfetch optionのdefaultをtrueに修正
  • Loading branch information...
1 parent e1c3017 commit 402f462ecbb540d90eaf9c034874ab0713d03fe6 @y-takahashi y-takahashi committed
Showing with 9 additions and 10 deletions.
  1. +1 −3 git-flow-feature
  2. +5 −3 git-flow-hotfix
  3. +3 −4 git-flow-release
View
4 git-flow-feature
@@ -228,7 +228,7 @@ cmd_start() {
}
cmd_finish() {
- DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
+ DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
DEFINE_boolean rebase false "rebase instead of merge" r
DEFINE_boolean keep false "keep branch after performing finish" k
DEFINE_boolean force_delete false "force delete feature branch after finish" D
@@ -349,10 +349,8 @@ helper_finish_cleanup() {
if noflag keep; then
if flag force_delete; then
git branch -D "$BRANCH"
- git push "$ORIGIN" :"$BRANCH"
else
git branch -d "$BRANCH"
- git push "$ORIGIN" :"$BRANCH"
fi
fi
View
8 git-flow-hotfix
@@ -154,7 +154,7 @@ require_no_existing_hotfix_branches() {
}
cmd_start() {
- DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
+ DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
parse_args "$@"
BASE=${2:-$MASTER_BRANCH}
require_version_arg
@@ -217,11 +217,11 @@ cmd_publish() {
}
cmd_finish() {
- DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
+ DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
DEFINE_boolean sign false "sign the release tag cryptographically" s
DEFINE_string signingkey "" "use the given GPG-key for the digital signature (implies -s)" u
DEFINE_string message "" "use the given tag message" m
- DEFINE_boolean push false "push to $ORIGIN after performing finish" p
+ DEFINE_boolean push true "push to $ORIGIN after performing finish" p
DEFINE_boolean keep false "keep branch after performing finish" k
DEFINE_boolean notag false "don't tag this release" n
parse_args "$@"
@@ -303,6 +303,8 @@ cmd_finish() {
git push --tags "$ORIGIN" || \
die "Could not push tags to $ORIGIN."
fi
+ git push "$ORIGIN" :"$BRANCH" || \
+ die "Could not delete the remote $BRANCH in $ORIGIN."
fi
echo
View
7 git-flow-release
@@ -150,7 +150,7 @@ require_no_existing_release_branches() {
}
cmd_start() {
- DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
+ DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
parse_args "$@"
BASE=${2:-$DEVELOP_BRANCH}
require_version_arg
@@ -186,11 +186,11 @@ cmd_start() {
}
cmd_finish() {
- DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
+ DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
DEFINE_boolean sign false "sign the release tag cryptographically" s
DEFINE_string signingkey "" "use the given GPG-key for the digital signature (implies -s)" u
DEFINE_string message "" "use the given tag message" m
- DEFINE_boolean push false "push to $ORIGIN after performing finish" p
+ DEFINE_boolean push true "push to $ORIGIN after performing finish" p
DEFINE_boolean keep false "keep branch after performing finish" k
DEFINE_boolean notag false "don't tag this release" n
@@ -264,7 +264,6 @@ cmd_finish() {
git checkout "$MASTER_BRANCH"
fi
git branch -d "$BRANCH"
- git push "$ORIGIN" :"$BRANCH"
fi
if flag push; then

0 comments on commit 402f462

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