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
c5fcc01a
Commit
c5fcc01a
authored
Feb 10, 2010
by
Vincent Driessen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not quote variable assignments.
parent
fafa2b28
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
26 deletions
+26
-26
git-flow-feature
git-flow-feature
+5
-5
git-flow-hotfix
git-flow-hotfix
+6
-6
git-flow-release
git-flow-release
+6
-6
git-flow-support
git-flow-support
+6
-6
gitflow-common
gitflow-common
+3
-3
No files found.
git-flow-feature
View file @
c5fcc01a
...
@@ -35,7 +35,7 @@ cmd_list() {
...
@@ -35,7 +35,7 @@ cmd_list() {
typeset feature_branches
typeset feature_branches
typeset current_branch
typeset current_branch
typeset short_names
typeset short_names
feature_branches=
"$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")"
feature_branches=
$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")
if [ -z "$feature_branches" ]; then
if [ -z "$feature_branches" ]; then
warn "No feature branches exist."
warn "No feature branches exist."
exit 0
exit 0
...
@@ -54,7 +54,7 @@ cmd_list() {
...
@@ -54,7 +54,7 @@ cmd_list() {
typeset branch
typeset branch
for branch in $short_names; do
for branch in $short_names; do
typeset fullname=
"$PREFIX$branch"
typeset fullname=
$PREFIX$branch
typeset base=$(git merge-base "$fullname" "$DEVELOP_BRANCH")
typeset base=$(git merge-base "$fullname" "$DEVELOP_BRANCH")
typeset develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
typeset develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
typeset branch_sha=$(git rev-parse "$fullname")
typeset branch_sha=$(git rev-parse "$fullname")
...
@@ -133,7 +133,7 @@ parse_args() {
...
@@ -133,7 +133,7 @@ parse_args() {
eval set -- "${FLAGS_ARGV}"
eval set -- "${FLAGS_ARGV}"
# read arguments into global variables
# read arguments into global variables
NAME=
"$1"
NAME=
$1
BRANCH=$PREFIX$NAME
BRANCH=$PREFIX$NAME
}
}
...
@@ -141,7 +141,7 @@ cmd_start() {
...
@@ -141,7 +141,7 @@ cmd_start() {
DEFINE_boolean fetch false 'fetch from origin before performing local operation' F
DEFINE_boolean fetch false 'fetch from origin before performing local operation' F
DEFINE_boolean force false 'force creation of feature branch (ignores dirty working tree)' f
DEFINE_boolean force false 'force creation of feature branch (ignores dirty working tree)' f
parse_args "$@"
parse_args "$@"
BASE=
"${2:-$DEVELOP_BRANCH}"
BASE=
${2:-$DEVELOP_BRANCH}
require_name_arg
require_name_arg
# sanity checks
# sanity checks
...
@@ -195,7 +195,7 @@ cmd_finish() {
...
@@ -195,7 +195,7 @@ cmd_finish() {
# exit code for "unmerged changes in working tree", which we should
# exit code for "unmerged changes in working tree", which we should
# actually be testing for here
# actually be testing for here
if gitflow_test_clean_working_tree; then
if gitflow_test_clean_working_tree; then
FINISH_BASE=
"$(cat "$GIT_DIR/.gitflow/MERGE_BASE")"
FINISH_BASE=
$(cat "$GIT_DIR/.gitflow/MERGE_BASE")
# Since the working tree is now clean, either the user did a
# Since the working tree is now clean, either the user did a
# succesfull merge manually, or the merge was cancelled.
# succesfull merge manually, or the merge was cancelled.
...
...
git-flow-hotfix
View file @
c5fcc01a
...
@@ -32,7 +32,7 @@ cmd_list() {
...
@@ -32,7 +32,7 @@ cmd_list() {
typeset hotfix_branches
typeset hotfix_branches
typeset current_branch
typeset current_branch
typeset short_names
typeset short_names
hotfix_branches=
"$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")"
hotfix_branches=
$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")
if [ -z "$hotfix_branches" ]; then
if [ -z "$hotfix_branches" ]; then
warn "No hotfix branches exist."
warn "No hotfix branches exist."
exit 0
exit 0
...
@@ -51,7 +51,7 @@ cmd_list() {
...
@@ -51,7 +51,7 @@ cmd_list() {
typeset branch
typeset branch
for branch in $short_names; do
for branch in $short_names; do
typeset fullname=
"$PREFIX$branch"
typeset fullname=
$PREFIX$branch
typeset base=$(git merge-base "$fullname" "$MASTER_BRANCH")
typeset base=$(git merge-base "$fullname" "$MASTER_BRANCH")
typeset master_sha=$(git rev-parse "$MASTER_BRANCH")
typeset master_sha=$(git rev-parse "$MASTER_BRANCH")
typeset branch_sha=$(git rev-parse "$fullname")
typeset branch_sha=$(git rev-parse "$fullname")
...
@@ -68,9 +68,9 @@ cmd_list() {
...
@@ -68,9 +68,9 @@ cmd_list() {
typeset tagname=$(git name-rev --tags --no-undefined --name-only $base)
typeset tagname=$(git name-rev --tags --no-undefined --name-only $base)
typeset nicename
typeset nicename
if [ "$tagname" != "" ]; then
if [ "$tagname" != "" ]; then
nicename=
"$tagname"
nicename=
$tagname
else
else
nicename=
"$(git rev-parse --short $base)"
nicename=
$(git rev-parse --short $base)
fi
fi
printf "(based on $nicename)"
printf "(based on $nicename)"
fi
fi
...
@@ -92,7 +92,7 @@ parse_args() {
...
@@ -92,7 +92,7 @@ parse_args() {
eval set -- "${FLAGS_ARGV}"
eval set -- "${FLAGS_ARGV}"
# read arguments into global variables
# read arguments into global variables
VERSION=
"$1"
VERSION=
$1
BRANCH=$PREFIX$VERSION
BRANCH=$PREFIX$VERSION
}
}
...
@@ -115,7 +115,7 @@ require_base_is_on_master() {
...
@@ -115,7 +115,7 @@ require_base_is_on_master() {
cmd_start() {
cmd_start() {
DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
parse_args "$@"
parse_args "$@"
BASE=
"${2:-$MASTER_BRANCH}"
BASE=
${2:-$MASTER_BRANCH}
require_version_arg
require_version_arg
require_base_is_on_master
require_base_is_on_master
...
...
git-flow-release
View file @
c5fcc01a
...
@@ -43,7 +43,7 @@ cmd_list() {
...
@@ -43,7 +43,7 @@ cmd_list() {
typeset release_branches
typeset release_branches
typeset current_branch
typeset current_branch
typeset short_names
typeset short_names
release_branches=
"$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")"
release_branches=
$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")
if [ -z "$release_branches" ]; then
if [ -z "$release_branches" ]; then
warn "No release branches exist."
warn "No release branches exist."
exit 0
exit 0
...
@@ -63,7 +63,7 @@ cmd_list() {
...
@@ -63,7 +63,7 @@ cmd_list() {
typeset branch
typeset branch
for branch in $short_names; do
for branch in $short_names; do
typeset fullname=
"$PREFIX$branch"
typeset fullname=
$PREFIX$branch
typeset base=$(git merge-base "$fullname" "$DEVELOP_BRANCH")
typeset base=$(git merge-base "$fullname" "$DEVELOP_BRANCH")
typeset develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
typeset develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
typeset branch_sha=$(git rev-parse "$fullname")
typeset branch_sha=$(git rev-parse "$fullname")
...
@@ -77,7 +77,7 @@ cmd_list() {
...
@@ -77,7 +77,7 @@ cmd_list() {
if [ "$branch_sha" = "$develop_sha" ]; then
if [ "$branch_sha" = "$develop_sha" ]; then
printf "(no commits yet)"
printf "(no commits yet)"
else
else
typeset nicename=
"$(git rev-parse --short $base)"
typeset nicename=
$(git rev-parse --short $base)
printf "(based on $nicename)"
printf "(based on $nicename)"
fi
fi
else
else
...
@@ -98,8 +98,8 @@ parse_args() {
...
@@ -98,8 +98,8 @@ parse_args() {
eval set -- "${FLAGS_ARGV}"
eval set -- "${FLAGS_ARGV}"
# read arguments into global variables
# read arguments into global variables
VERSION=
"$1"
VERSION=
$1
BRANCH=
"$PREFIX$VERSION"
BRANCH=
$PREFIX$VERSION
}
}
require_version_arg() {
require_version_arg() {
...
@@ -121,7 +121,7 @@ require_base_is_on_develop() {
...
@@ -121,7 +121,7 @@ require_base_is_on_develop() {
cmd_start() {
cmd_start() {
DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
parse_args "$@"
parse_args "$@"
BASE=
"${2:-$DEVELOP_BRANCH}"
BASE=
${2:-$DEVELOP_BRANCH}
require_version_arg
require_version_arg
require_base_is_on_develop
require_base_is_on_develop
...
...
git-flow-support
View file @
c5fcc01a
...
@@ -34,7 +34,7 @@ cmd_list() {
...
@@ -34,7 +34,7 @@ cmd_list() {
typeset support_branches
typeset support_branches
typeset current_branch
typeset current_branch
typeset short_names
typeset short_names
support_branches=
"$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")"
support_branches=
$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")
if [ -z "$support_branches" ]; then
if [ -z "$support_branches" ]; then
warn "No support branches exist."
warn "No support branches exist."
exit 0
exit 0
...
@@ -53,7 +53,7 @@ cmd_list() {
...
@@ -53,7 +53,7 @@ cmd_list() {
typeset branch
typeset branch
for branch in $short_names; do
for branch in $short_names; do
typeset fullname=
"$PREFIX$branch"
typeset fullname=
$PREFIX$branch
typeset base=$(git merge-base "$fullname" "$MASTER_BRANCH")
typeset base=$(git merge-base "$fullname" "$MASTER_BRANCH")
typeset master_sha=$(git rev-parse "$MASTER_BRANCH")
typeset master_sha=$(git rev-parse "$MASTER_BRANCH")
typeset branch_sha=$(git rev-parse "$fullname")
typeset branch_sha=$(git rev-parse "$fullname")
...
@@ -70,9 +70,9 @@ cmd_list() {
...
@@ -70,9 +70,9 @@ cmd_list() {
typeset tagname=$(git name-rev --tags --no-undefined --name-only $base)
typeset tagname=$(git name-rev --tags --no-undefined --name-only $base)
typeset nicename
typeset nicename
if [ "$tagname" != "" ]; then
if [ "$tagname" != "" ]; then
nicename=
"$tagname"
nicename=
$tagname
else
else
nicename=
"$(git rev-parse --short $base)"
nicename=
$(git rev-parse --short $base)
fi
fi
printf "(based on $nicename)"
printf "(based on $nicename)"
fi
fi
...
@@ -94,8 +94,8 @@ parse_args() {
...
@@ -94,8 +94,8 @@ parse_args() {
eval set -- "${FLAGS_ARGV}"
eval set -- "${FLAGS_ARGV}"
# read arguments into global variables
# read arguments into global variables
VERSION=
"$1"
VERSION=
$1
BASE=
"$2"
BASE=
$2
BRANCH=$PREFIX$VERSION
BRANCH=$PREFIX$VERSION
}
}
...
...
gitflow-common
View file @
c5fcc01a
...
@@ -61,8 +61,8 @@ ALL_TAGS=$(git tag)
...
@@ -61,8 +61,8 @@ ALL_TAGS=$(git tag)
# 2: Multiple matches found. These matches are written to stderr
# 2: Multiple matches found. These matches are written to stderr
#
#
resolve_nameprefix() {
resolve_nameprefix() {
typeset name=
"$1"
typeset name=
$1
typeset prefix=
"$2"
typeset prefix=
$2
typeset matches
typeset matches
typeset -i num_matches
typeset -i num_matches
...
@@ -72,7 +72,7 @@ resolve_nameprefix() {
...
@@ -72,7 +72,7 @@ resolve_nameprefix() {
return 0
return 0
fi
fi
matches=
"$(echo "$LOCAL_BRANCHES" | grep "^$prefix$name")"
matches=
$(echo "$LOCAL_BRANCHES" | grep "^$prefix$name")
num_matches=$(echo "$matches" | wc -l)
num_matches=$(echo "$matches" | wc -l)
if [ -z "$matches" ]; then
if [ -z "$matches" ]; then
# no prefix match, so take it literally
# no prefix match, so take it literally
...
...
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