This repository has been archived by the owner on Jun 19, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 527
Implement in-place release with -i/--inplace option #2
Merged
petervanderdoes
merged 5 commits into
petervanderdoes:develop
from
baby-gnu:feature/in-place-release
Jul 11, 2012
Merged
Implement in-place release with -i/--inplace option #2
petervanderdoes
merged 5 commits into
petervanderdoes:develop
from
baby-gnu:feature/in-place-release
Jul 11, 2012
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This implement a solution to issue #133 "Add ability to release directly from develop". When in-place is activated: - the current branch must be merged in the develop branch - no mergeback occurs - no branch deletion occurs The in-place release can be called in two ways: git flow release finish -i <version> or a shorter form: git flow release -i <version> * git-flow-release (cmd_default): Define flags of cmd_list() and cmd_finish() to support the shorter call form. Call cmd_finish() if inplace is enabled. (cmd_list): Avoid warning by redefining the verbose flag if called from cmd_default(). (cmd_finish): Avoid warning by redefining flags if called from cmd_default(). Add filter on the version. Do not merge back and delete branch when inplace is enabled
* git-flow-release (cmd_finish): Rename $BASE to $BRANCH and add branch equal requirement.
* git-flow-release (cmd_finish): Add conditional on remote branch existence.
* git-flow-release (cmd_finish): Remove equality test to remote develop branch.
I won't implement the shorter version
Instead of:
|
I'm fine with this, I should have done two commit as I was not sure for the shorter form. The shorter form would be possible if shFlags permit to ignore unknown flags, say |
petervanderdoes
pushed a commit
that referenced
this pull request
Jul 13, 2012
Commit pointed by tags are reachable with <rev>^0[1]. * gitflow-common (git_is_ancestor): Dereference tags. Footnotes: [1] https://www.kernel.org/pub/software/scm/git/docs/git-rev-parse.html fixes: #2
ChrisJStone
referenced
this pull request
in CJ-Systems/gitflow-cjs
Jun 14, 2023
Fix redirecting links in README
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This implement a solution to issue #133 "Add ability to release directly
from develop".
When in-place is activated:
The in-place release can be called in two ways:
or a shorter form:
cmd_finish() to support the shorter call form.
Call cmd_finish() if inplace is enabled.
(cmd_list): Avoid warning by redefining the verbose flag if called from
cmd_default().
(cmd_finish): Avoid warning by redefining flags if called from
cmd_default().
Add filter on the version.
Do not merge back and delete branch when inplace is enabled