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
2ba9a4da
Commit
2ba9a4da
authored
Jan 27, 2010
by
Vincent Driessen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: run git commands in the foreground, instead of the background.
parent
67f781fa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
git-flow
git-flow
+4
-4
No files found.
git-flow
View file @
2ba9a4da
...
...
@@ -65,7 +65,7 @@ main() {
exit
1
fi
if
!
git rev-parse
--git-dir
&
>/dev/null
;
then
if
!
git rev-parse
--git-dir
>
/dev/null
;
then
die
"Not a git repository"
fi
...
...
@@ -90,7 +90,7 @@ gitflow_init() {
echo
echo
"Summary of actions:"
if
!
git rev-parse
--git-dir
&
>/dev/null
;
then
if
!
git rev-parse
--git-dir
>
/dev/null
;
then
git init
--quiet
echo
"- A new git repository at
$PWD
was created"
fi
...
...
@@ -105,7 +105,7 @@ gitflow_init() {
echo
"- An initial commit was created at branch '
$MASTER_BRANCH
'"
fi
if
!
git rev-parse
--verify
$MASTER_BRANCH
&
>/dev/null
;
then
if
!
git rev-parse
--verify
$MASTER_BRANCH
>
/dev/null
;
then
die
"Cannot find your master branch. Try: git branch -m <mymaster>
$MASTER_BRANCH
"
fi
...
...
@@ -116,7 +116,7 @@ gitflow_init() {
gitflow_require_branches_equal
$MASTER_BRANCH
$ORIGIN
/
$MASTER_BRANCH
fi
if
git rev-parse
--verify
$DEVELOP_BRANCH
&
>/dev/null
;
then
if
git rev-parse
--verify
$DEVELOP_BRANCH
>
/dev/null
;
then
gitflow_require_branches_equal
$DEVELOP_BRANCH
$ORIGIN
/
$DEVELOP_BRANCH
else
git checkout
-q
-b
$DEVELOP_BRANCH
$MASTER_BRANCH
...
...
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