Skip to content
This repository

fix a bug that cause failure to delete a hotfix branch #301

Open
wants to merge 1 commit into from

1 participant

JiangYouxin
JiangYouxin

When resolve conflicts manully.

fix some comment bugs in git-flow-hotfix.

Jiang Youxin fix a bug that cause failure to delete a branch, when trying to finis…
…h a hotfix after resolve conflicts manully.

fix some comment bugs in git-flow-hotfix
e9930c5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Feb 13, 2013
Jiang Youxin fix a bug that cause failure to delete a branch, when trying to finis…
…h a hotfix after resolve conflicts manully.

fix some comment bugs in git-flow-hotfix
e9930c5
This page is out of date. Refresh to see the latest.

Showing 1 changed file with 7 additions and 6 deletions. Show diff stats Hide diff stats

  1. +7 6 git-flow-hotfix
13 git-flow-hotfix
@@ -284,8 +284,8 @@ cmd_finish() {
284 284 fi
285 285
286 286 if noflag notag; then
287   - # try to tag the release
288   - # in case a previous attempt to finish this release branch has failed,
  287 + # try to tag the hotfix
  288 + # in case a previous attempt to finish this hotfix branch has failed,
289 289 # but the tag was set successful, we skip it now
290 290 local tagname=$VERSION_PREFIX$VERSION
291 291 if ! git_tag_exists "$tagname"; then
@@ -302,10 +302,9 @@ cmd_finish() {
302 302 # try to merge into develop
303 303 # in case a previous attempt to finish this release branch has failed,
304 304 # but the merge into develop was successful, we skip it now
  305 + git_do checkout "$DEVELOP_BRANCH" || \
  306 + die "Could not check out $DEVELOP_BRANCH."
305 307 if ! git_is_branch_merged_into "$BRANCH" "$DEVELOP_BRANCH"; then
306   - git_do checkout "$DEVELOP_BRANCH" || \
307   - die "Could not check out $DEVELOP_BRANCH."
308   -
309 308 # TODO: Actually, accounting for 'git describe' pays, so we should
310 309 # ideally git merge --no-ff $tagname here, instead!
311 310 git_do merge --no-ff "$BRANCH" || \
@@ -331,7 +330,9 @@ cmd_finish() {
331 330
332 331 echo
333 332 echo "Summary of actions:"
334   - echo "- Latest objects have been fetched from '$ORIGIN'"
  333 + if flag fetch; then
  334 + echo "- Latest objects have been fetched from '$ORIGIN'"
  335 + fi
335 336 echo "- Hotfix branch has been merged into '$MASTER_BRANCH'"
336 337 if noflag notag; then
337 338 echo "- The hotfix was tagged '$VERSION_PREFIX$VERSION'"

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.