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
48386441
Commit
48386441
authored
Jan 29, 2010
by
Vincent Driessen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace gitflow_check_ prefixes by gitflow_require_ prefixes, for consistency.
parent
278884b5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+11
-11
git-flow
git-flow
+1
-1
git-flow-feature
git-flow-feature
+4
-4
git-flow-hotfix
git-flow-hotfix
+2
-2
git-flow-init
git-flow-init
+1
-1
git-flow-release
git-flow-release
+2
-2
git-flow-support
git-flow-support
+1
-1
No files found.
git-flow
View file @
48386441
...
@@ -83,7 +83,7 @@ main() {
...
@@ -83,7 +83,7 @@ main() {
cmd_
$SUBACTION
"
$@
"
cmd_
$SUBACTION
"
$@
"
}
}
gitflow_
check
_clean_working_tree
()
{
gitflow_
require
_clean_working_tree
()
{
if
!
git diff
--no-ext-diff
--ignore-submodules
--quiet
--exit-code
;
then
if
!
git diff
--no-ext-diff
--ignore-submodules
--quiet
--exit-code
;
then
die
"Working tree contains unstaged changes. Aborting ..."
die
"Working tree contains unstaged changes. Aborting ..."
fi
fi
...
...
git-flow-feature
View file @
48386441
...
@@ -69,7 +69,7 @@ cmd_start() {
...
@@ -69,7 +69,7 @@ cmd_start() {
parse_args "$@"
parse_args "$@"
# sanity checks
# sanity checks
gitflow_
check
_clean_working_tree
gitflow_
require
_clean_working_tree
gitflow_require_branch_absent $BRANCH
gitflow_require_branch_absent $BRANCH
if [ "$BASE" = "$DEVELOP_BRANCH" ]; then
if [ "$BASE" = "$DEVELOP_BRANCH" ]; then
git fetch -q $ORIGIN $DEVELOP_BRANCH
git fetch -q $ORIGIN $DEVELOP_BRANCH
...
@@ -94,7 +94,7 @@ cmd_finish() {
...
@@ -94,7 +94,7 @@ cmd_finish() {
parse_args "$@"
parse_args "$@"
# sanity checks
# sanity checks
gitflow_
check
_clean_working_tree
gitflow_
require
_clean_working_tree
gitflow_require_branch $BRANCH
gitflow_require_branch $BRANCH
git fetch -q $ORIGIN
git fetch -q $ORIGIN
if has $ORIGIN/$BRANCH $REMOTE_BRANCHES; then
if has $ORIGIN/$BRANCH $REMOTE_BRANCHES; then
...
@@ -130,7 +130,7 @@ cmd_publish() {
...
@@ -130,7 +130,7 @@ cmd_publish() {
parse_args "$@"
parse_args "$@"
# sanity checks
# sanity checks
gitflow_
check
_clean_working_tree
gitflow_
require
_clean_working_tree
gitflow_require_branch $BRANCH
gitflow_require_branch $BRANCH
git fetch -q $ORIGIN
git fetch -q $ORIGIN
gitflow_require_branch_absent $ORIGIN/$BRANCH
gitflow_require_branch_absent $ORIGIN/$BRANCH
...
@@ -156,7 +156,7 @@ cmd_track() {
...
@@ -156,7 +156,7 @@ cmd_track() {
parse_args "$@"
parse_args "$@"
# sanity checks
# sanity checks
gitflow_
check
_clean_working_tree
gitflow_
require
_clean_working_tree
gitflow_require_branch_absent $BRANCH
gitflow_require_branch_absent $BRANCH
git fetch -q $ORIGIN
git fetch -q $ORIGIN
gitflow_require_branch $ORIGIN/$BRANCH
gitflow_require_branch $ORIGIN/$BRANCH
...
...
git-flow-hotfix
View file @
48386441
...
@@ -63,7 +63,7 @@ cmd_start() {
...
@@ -63,7 +63,7 @@ cmd_start() {
parse_args "$@"
parse_args "$@"
# sanity checks
# sanity checks
gitflow_
check
_clean_working_tree
gitflow_
require
_clean_working_tree
git fetch -q $ORIGIN
git fetch -q $ORIGIN
gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
gitflow_require_branch_absent $BRANCH
gitflow_require_branch_absent $BRANCH
...
@@ -89,7 +89,7 @@ cmd_finish() {
...
@@ -89,7 +89,7 @@ cmd_finish() {
parse_args "$@"
parse_args "$@"
# sanity checks
# sanity checks
gitflow_
check
_clean_working_tree
gitflow_
require
_clean_working_tree
git fetch -q $ORIGIN $MASTER_BRANCH
git fetch -q $ORIGIN $MASTER_BRANCH
git fetch -q $ORIGIN $DEVELOP_BRANCH
git fetch -q $ORIGIN $DEVELOP_BRANCH
gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
...
...
git-flow-init
View file @
48386441
...
@@ -40,7 +40,7 @@ cmd_default() {
...
@@ -40,7 +40,7 @@ cmd_default() {
die "Cannot find your master branch. Try: git branch -m <mymaster> $MASTER_BRANCH"
die "Cannot find your master branch. Try: git branch -m <mymaster> $MASTER_BRANCH"
fi
fi
gitflow_
check
_clean_working_tree
gitflow_
require
_clean_working_tree
if git remote | grep -q $ORIGIN; then
if git remote | grep -q $ORIGIN; then
git fetch -q $ORIGIN
git fetch -q $ORIGIN
...
...
git-flow-release
View file @
48386441
...
@@ -64,7 +64,7 @@ cmd_start() {
...
@@ -64,7 +64,7 @@ cmd_start() {
parse_args "$@"
parse_args "$@"
# sanity checks
# sanity checks
gitflow_
check
_clean_working_tree
gitflow_
require
_clean_working_tree
git fetch -q $ORIGIN
git fetch -q $ORIGIN
gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
gitflow_require_branch_absent $BRANCH
gitflow_require_branch_absent $BRANCH
...
@@ -90,7 +90,7 @@ cmd_finish() {
...
@@ -90,7 +90,7 @@ cmd_finish() {
parse_args "$@"
parse_args "$@"
# sanity checks
# sanity checks
gitflow_
check
_clean_working_tree
gitflow_
require
_clean_working_tree
git fetch -q $ORIGIN
git fetch -q $ORIGIN
gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
...
...
git-flow-support
View file @
48386441
...
@@ -53,7 +53,7 @@ cmd_start() {
...
@@ -53,7 +53,7 @@ cmd_start() {
parse_args "$@"
parse_args "$@"
# sanity checks
# sanity checks
gitflow_
check
_clean_working_tree
gitflow_
require
_clean_working_tree
# create branch
# create branch
git checkout -b $BRANCH $BASE
git checkout -b $BRANCH $BASE
...
...
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