Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

- 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...
commit f6fcc4eed9c720ba9f0fab89e5f677be36efa7e2 1 parent baf66be
authored
7  git-flow-feature
@@ -281,16 +281,17 @@ cmd_finish() {
281 281
 	require_clean_working_tree
282 282
 
283 283
 	# update local repo with remote changes first, if asked
284  
-	if has "$ORIGIN/$BRANCH" "$(git_remote_branches)"; then
  284
+	if has "$ORIGIN/$BRANCH" $(git_remote_branches); then
285 285
 		if flag fetch; then
286 286
 			git fetch -q "$ORIGIN" "$BRANCH"
  287
+			git fetch -q "$ORIGIN" "$DEVELOP_BRANCH"
287 288
 		fi
288 289
 	fi
289 290
 
290  
-	if has "$ORIGIN/$BRANCH" "$(git_remote_branches)"; then
  291
+	if has "$ORIGIN/$BRANCH" $(git_remote_branches); then
291 292
 		require_branches_equal "$BRANCH" "$ORIGIN/$BRANCH"
292 293
 	fi
293  
-	if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
  294
+	if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
294 295
 		require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
295 296
 	fi
296 297
 
6  git-flow-hotfix
@@ -167,7 +167,7 @@ cmd_start() {
167 167
 	if flag fetch; then
168 168
 		git fetch -q "$ORIGIN" "$MASTER_BRANCH"
169 169
 	fi
170  
-	if has "$ORIGIN/$MASTER_BRANCH" "$(git_remote_branches)"; then
  170
+	if has "$ORIGIN/$MASTER_BRANCH" $(git_remote_branches); then
171 171
 		require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
172 172
 	fi
173 173
 
@@ -213,10 +213,10 @@ cmd_finish() {
213 213
 		git fetch -q "$ORIGIN" "$DEVELOP_BRANCH" || \
214 214
 		  die "Could not fetch $DEVELOP_BRANCH from $ORIGIN."
215 215
 	fi
216  
-	if has "$ORIGIN/$MASTER_BRANCH" "$(git_remote_branches)"; then
  216
+	if has "$ORIGIN/$MASTER_BRANCH" $(git_remote_branches); then
217 217
 		require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
218 218
 	fi
219  
-	if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
  219
+	if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
220 220
 		require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
221 221
 	fi
222 222
 
6  git-flow-release
@@ -164,7 +164,7 @@ cmd_start() {
164 164
 	if flag fetch; then
165 165
 		git fetch -q "$ORIGIN" "$DEVELOP_BRANCH"
166 166
 	fi
167  
-	if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
  167
+	if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
168 168
 		require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
169 169
 	fi
170 170
 
@@ -211,10 +211,10 @@ cmd_finish() {
211 211
 		git fetch -q "$ORIGIN" "$DEVELOP_BRANCH" || \
212 212
 		  die "Could not fetch $DEVELOP_BRANCH from $ORIGIN."
213 213
 	fi
214  
-	if has "$ORIGIN/$MASTER_BRANCH" "$(git_remote_branches)"; then
  214
+	if has "$ORIGIN/$MASTER_BRANCH" $(git_remote_branches); then
215 215
 		require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
216 216
 	fi
217  
-	if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
  217
+	if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
218 218
 		require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
219 219
 	fi
220 220
 

0 notes on commit f6fcc4e

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