Skip to content
This repository has been archived by the owner on Jun 19, 2023. It is now read-only.

In place release correct implementation? #22

Closed
petervanderdoes opened this issue Jul 20, 2012 · 4 comments
Closed

In place release correct implementation? #22

petervanderdoes opened this issue Jul 20, 2012 · 4 comments
Assignees
Milestone

Comments

@petervanderdoes
Copy link
Owner

As discussed in #21
As I'm going through the code, I'm not sure I understand the following bit:

if flag inplace; then
    BRANCH="$(git_current_branch)"

The git_current_branch is not correct, the in-place release should release the develop branch, not the branch you are currently on, according to the original issue #133 and that means it would never have to merge back in the develop branch but it actually should merge in the master branch.

As I'm thinking this through I honestly believe we should get rid of the inplace flag and replace it with a sub-command

git flow release branch [\<branch_name>]

Some points about this

  • No need for a release branch.
  • By default the branch would be the develop branch, but it can't be a release/hotfix/feature branch. I don't see why you would do that anyway.
  • If it's not the develop branch, the user can select to merge the branch into the develop branch.
  • Never delete the branch.
  • Merge the branch in the master branch.
  • and maybe some other things I can't think of right now.
@baby-gnu
Copy link

Erf, looking at the history of the commits of my pull request #2, it was what I tried to do but finally got wrong (baby-gnu/gitflow@593e33d baby-gnu/gitflow@e0fec4b).

The in-place was somewhat miss-named, I agree for a sub-command.

@petervanderdoes
Copy link
Owner Author

Cool, I'll work on it in the next few days

@petervanderdoes
Copy link
Owner Author

The command structure I choose:

git flow release branch <version> [<branch_name>]

The version number would be used for tagging during the process.

@ghost ghost assigned petervanderdoes Jul 23, 2012
@petervanderdoes
Copy link
Owner Author

Implemented in the develop branch

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants