Permalink
Browse files

- Removed quoting in has $SOME_BRANCH $(get_remote_branches), as the …

…check was always false

- Added fetching develop branch from origin when fetch flag is on in feature finish
  • Loading branch information...
1 parent baf66be commit f6fcc4eed9c720ba9f0fab89e5f677be36efa7e2 Konstantin Tjuterev committed Apr 14, 2011
Showing with 10 additions and 9 deletions.
  1. +4 −3 git-flow-feature
  2. +3 −3 git-flow-hotfix
  3. +3 −3 git-flow-release
View
7 git-flow-feature
@@ -281,16 +281,17 @@ cmd_finish() {
require_clean_working_tree
# update local repo with remote changes first, if asked
- if has "$ORIGIN/$BRANCH" "$(git_remote_branches)"; then
+ if has "$ORIGIN/$BRANCH" $(git_remote_branches); then
if flag fetch; then
git fetch -q "$ORIGIN" "$BRANCH"
+ git fetch -q "$ORIGIN" "$DEVELOP_BRANCH"
fi
fi
- if has "$ORIGIN/$BRANCH" "$(git_remote_branches)"; then
+ if has "$ORIGIN/$BRANCH" $(git_remote_branches); then
require_branches_equal "$BRANCH" "$ORIGIN/$BRANCH"
fi
- if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
+ if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
fi
View
6 git-flow-hotfix
@@ -167,7 +167,7 @@ cmd_start() {
if flag fetch; then
git fetch -q "$ORIGIN" "$MASTER_BRANCH"
fi
- if has "$ORIGIN/$MASTER_BRANCH" "$(git_remote_branches)"; then
+ if has "$ORIGIN/$MASTER_BRANCH" $(git_remote_branches); then
require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
fi
@@ -213,10 +213,10 @@ cmd_finish() {
git fetch -q "$ORIGIN" "$DEVELOP_BRANCH" || \
die "Could not fetch $DEVELOP_BRANCH from $ORIGIN."
fi
- if has "$ORIGIN/$MASTER_BRANCH" "$(git_remote_branches)"; then
+ if has "$ORIGIN/$MASTER_BRANCH" $(git_remote_branches); then
require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
fi
- if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
+ if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
fi
View
6 git-flow-release
@@ -164,7 +164,7 @@ cmd_start() {
if flag fetch; then
git fetch -q "$ORIGIN" "$DEVELOP_BRANCH"
fi
- if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
+ if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
fi
@@ -211,10 +211,10 @@ cmd_finish() {
git fetch -q "$ORIGIN" "$DEVELOP_BRANCH" || \
die "Could not fetch $DEVELOP_BRANCH from $ORIGIN."
fi
- if has "$ORIGIN/$MASTER_BRANCH" "$(git_remote_branches)"; then
+ if has "$ORIGIN/$MASTER_BRANCH" $(git_remote_branches); then
require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
fi
- if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
+ if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
fi

0 comments on commit f6fcc4e

Please sign in to comment.