Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitflow
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tools
gitflow
Commits
92c16a9e
Commit
92c16a9e
authored
Sep 30, 2010
by
Felipe Talavera
Committed by
Vincent Driessen
Oct 01, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adds a check to avoid the delete release branch problem in release finish
parent
4c90d928
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
0 deletions
+10
-0
git-flow-release
git-flow-release
+10
-0
No files found.
git-flow-release
View file @
92c16a9e
...
...
@@ -149,6 +149,15 @@ require_no_existing_release_branches() {
die "There is an existing release branch ($first_branch). Finish that one first."
}
git_actual_branch(){
git branch --no-color | grep '^*' | sed 's/^[* ] //'
}
require_not_being_in_release_branch() {
if has $BRANCH $(git_actual_branch); then
die "You cannot be in the '$BRANCH' branch when you finnish it."
fi
}
cmd_start() {
DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
parse_args "$@"
...
...
@@ -203,6 +212,7 @@ cmd_finish() {
# sanity checks
require_branch "$BRANCH"
require_clean_working_tree
require_not_being_in_release_branch
if flag fetch; then
git fetch -q "$ORIGIN" "$MASTER_BRANCH" || \
die "Could not fetch $MASTER_BRANCH from $ORIGIN."
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment