blob: 5750fd1e7dd4e4bb4e692ac41fa65b83a466fe3e [file] [log] [blame]
Vincent Driessen186d2b52010-01-27 23:48:39 +01001#
2# git-flow -- A collection of Git extensions to provide high-level
3# repository operations for Vincent Driessen's branching model.
4#
5# Original blog post presenting this model is found at:
6# http://nvie.com/archives/323
7#
8# Feel free to contribute to this project at:
9# http://github.com/nvie/gitflow
10#
Vincent Driessend72acba2010-04-04 16:10:17 +020011# Copyright 2010 Vincent Driessen. All rights reserved.
12#
13# Redistribution and use in source and binary forms, with or without
14# modification, are permitted provided that the following conditions are met:
15#
16# 1. Redistributions of source code must retain the above copyright notice,
17# this list of conditions and the following disclaimer.
18#
19# 2. Redistributions in binary form must reproduce the above copyright
20# notice, this list of conditions and the following disclaimer in the
21# documentation and/or other materials provided with the distribution.
22#
23# THIS SOFTWARE IS PROVIDED BY VINCENT DRIESSEN ``AS IS'' AND ANY EXPRESS OR
24# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
25# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
26# EVENT SHALL VINCENT DRIESSEN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
27# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
28# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
30# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
31# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
32# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33#
34# The views and conclusions contained in the software and documentation are
35# those of the authors and should not be interpreted as representing official
36# policies, either expressed or implied, of Vincent Driessen.
Vincent Driessen186d2b52010-01-27 23:48:39 +010037#
38
39usage() {
Vincent Driessena2e41162010-02-24 01:37:07 +010040 echo "usage: git flow init [-f]"
Vincent Driessen186d2b52010-01-27 23:48:39 +010041}
42
Vincent Driessen131c2982010-02-20 14:30:16 +010043parse_args() {
44 # parse options
45 FLAGS "$@" || exit $?
46 eval set -- "${FLAGS_ARGV}"
47}
48
Vincent Driessen186d2b52010-01-27 23:48:39 +010049# Default entry when no SUBACTION is given
50cmd_default() {
Vincent Driessen131c2982010-02-20 14:30:16 +010051 DEFINE_boolean force false 'force setting of gitflow branches, even if already configured' f
52 parse_args "$@"
53
Vincent Driessen283b0f72010-02-15 23:23:14 +010054 if ! git rev-parse --git-dir >/dev/null 2>&1; then
Vincent Driessen0161de52010-02-18 12:07:34 +010055 git init
56 else
Vincent Driessen131c2982010-02-20 14:30:16 +010057 # assure that we are not working in a repo with local changes
Vincent Driessen7832d6e2010-02-21 21:31:03 +010058 git_repo_is_headless || require_clean_working_tree
Vincent Driessen131c2982010-02-20 14:30:16 +010059 fi
60
61 # running git flow init on an already initialized repo is fine
62 if gitflow_is_initialized && ! flag force; then
63 warn "Already initialized for gitflow."
64 warn "To force reinitialization, use: git flow init -f"
65 exit 0
Vincent Driessen186d2b52010-01-27 23:48:39 +010066 fi
67
Vincent Driessen0161de52010-02-18 12:07:34 +010068 local branch_count
Vincent Driessenf476d262010-02-20 16:23:47 +010069 local answer
Vincent Driessen0161de52010-02-18 12:07:34 +010070
71 # add a master branch if no such branch exists yet
72 local master_branch
Vincent Driessen131c2982010-02-20 14:30:16 +010073 if gitflow_has_master_configured && ! flag force; then
74 master_branch=$(git config --get gitflow.branch.master)
75 else
76 # Two cases are distinguished:
77 # 1. A fresh git repo (without any branches)
78 # We will create a new master/develop branch for the user
79 # 2. Some branches do already exist
80 # We will disallow creation of new master/develop branches and
81 # rather allow to use existing branches for git-flow.
82 local default_suggestion
83 local should_check_existence
Vincent Driessen7832d6e2010-02-21 21:31:03 +010084 branch_count=$(git_local_branches | wc -l)
Vincent Driessen131c2982010-02-20 14:30:16 +010085 if [ "$branch_count" -eq 0 ]; then
86 echo "No branches exist yet. Base branches must be created now."
87 should_check_existence=NO
Vincent Driessenb1033aa2010-03-23 21:10:13 +010088 default_suggestion=$(git config --get gitflow.branch.master || echo master)
Vincent Driessen131c2982010-02-20 14:30:16 +010089 else
90 echo
91 echo "Which branch should be used for bringing forth production releases?"
Vincent Driessen7832d6e2010-02-21 21:31:03 +010092 git_local_branches | sed 's/^.*$/ - &/g'
Vincent Driessen131c2982010-02-20 14:30:16 +010093
94 should_check_existence=YES
95 default_suggestion=
Vincent Driessenb1033aa2010-03-23 21:10:13 +010096 for guess in $(git config --get gitflow.branch.master) \
97 'production' 'main' 'master'; do
Vincent Driessen7832d6e2010-02-21 21:31:03 +010098 if git_local_branch_exists "$guess"; then
Vincent Driessen131c2982010-02-20 14:30:16 +010099 default_suggestion="$guess"
100 break
101 fi
102 done
Vincent Driessen186d2b52010-01-27 23:48:39 +0100103 fi
Vincent Driessen131c2982010-02-20 14:30:16 +0100104
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100105 printf "Branch name for production releases: [$default_suggestion] "
Vincent Driessen131c2982010-02-20 14:30:16 +0100106 read answer
107 master_branch=${answer:-$default_suggestion}
108
109 # check existence in case of an already existing repo
110 if [ "$should_check_existence" = "YES" ]; then
Vincent Driessen7832d6e2010-02-21 21:31:03 +0100111 git_local_branch_exists "$master_branch" || \
Vincent Driessen131c2982010-02-20 14:30:16 +0100112 die "Local branch '$master_branch' does not exist."
113 fi
Vincent Driessen0161de52010-02-18 12:07:34 +0100114
Vincent Driessen61882062010-02-18 12:32:20 +0100115 # store the name of the master branch
116 git config gitflow.branch.master "$master_branch"
Vincent Driessen186d2b52010-01-27 23:48:39 +0100117 fi
118
Vincent Driessen0161de52010-02-18 12:07:34 +0100119 # add a develop branch if no such branch exists yet
120 local develop_branch
Vincent Driessen131c2982010-02-20 14:30:16 +0100121 if gitflow_has_develop_configured && ! flag force; then
122 develop_branch=$(git config --get gitflow.branch.develop)
123 else
124 # Again, the same two cases as with the master selection are
125 # considered (fresh repo or repo that contains branches)
126 local default_suggestion
127 local should_check_existence
Vincent Driessen7832d6e2010-02-21 21:31:03 +0100128 branch_count=$(git_local_branches | grep -v "^${master_branch}\$" | wc -l)
Vincent Driessen131c2982010-02-20 14:30:16 +0100129 if [ "$branch_count" -eq 0 ]; then
130 should_check_existence=NO
Vincent Driessenb1033aa2010-03-23 21:10:13 +0100131 default_suggestion=$(git config --get gitflow.branch.develop || echo develop)
Vincent Driessen131c2982010-02-20 14:30:16 +0100132 else
133 echo
134 echo "Which branch should be used for integration of the \"next release\"?"
Vincent Driessen7832d6e2010-02-21 21:31:03 +0100135 git_local_branches | grep -v "^${master_branch}\$" | sed 's/^.*$/ - &/g'
Vincent Driessen131c2982010-02-20 14:30:16 +0100136
137 should_check_existence=YES
138 default_suggestion=
Vincent Driessenb1033aa2010-03-23 21:10:13 +0100139 for guess in $(git config --get gitflow.branch.develop) \
140 'develop' 'int' 'integration' 'master'; do
Vincent Driessen7832d6e2010-02-21 21:31:03 +0100141 if git_local_branch_exists "$guess"; then
Vincent Driessen131c2982010-02-20 14:30:16 +0100142 default_suggestion="$guess"
143 break
144 fi
145 done
Vincent Driessen0161de52010-02-18 12:07:34 +0100146 fi
Vincent Driessen131c2982010-02-20 14:30:16 +0100147
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100148 printf "Branch name for \"next release\" development: [$default_suggestion] "
Vincent Driessen131c2982010-02-20 14:30:16 +0100149 read answer
150 develop_branch=${answer:-$default_suggestion}
151
152 if [ "$master_branch" = "$develop_branch" ]; then
153 die "Production and integration branches should differ."
154 fi
155
156 # check existence in case of an already existing repo
157 if [ "$should_check_existence" = "YES" ]; then
Vincent Driessen7832d6e2010-02-21 21:31:03 +0100158 git_local_branch_exists "$develop_branch" || \
Vincent Driessen131c2982010-02-20 14:30:16 +0100159 die "Local branch '$develop_branch' does not exist."
160 fi
Vincent Driessen0161de52010-02-18 12:07:34 +0100161
Vincent Driessen61882062010-02-18 12:32:20 +0100162 # store the name of the develop branch
163 git config gitflow.branch.develop "$develop_branch"
Vincent Driessen0161de52010-02-18 12:07:34 +0100164 fi
165
Vincent Driessen131c2982010-02-20 14:30:16 +0100166 # Creation of HEAD
167 # ----------------
168 # We create a HEAD now, if it does not exist yet (in a fresh repo). We need
169 # it to be able to create new branches.
Vincent Driessen3227d802010-02-20 16:13:23 +0100170 local created_gitflow_branch=0
Vincent Driessen0161de52010-02-18 12:07:34 +0100171 if ! git rev-parse --quiet --verify HEAD >/dev/null 2>&1; then
Vincent Driessen0161de52010-02-18 12:07:34 +0100172 git symbolic-ref HEAD "refs/heads/$master_branch"
Vincent Driessen61882062010-02-18 12:32:20 +0100173 git commit --allow-empty --quiet -m "Initial commit"
Vincent Driessen3227d802010-02-20 16:13:23 +0100174 created_gitflow_branch=1
Vincent Driessen0161de52010-02-18 12:07:34 +0100175 fi
176
Vincent Driessen131c2982010-02-20 14:30:16 +0100177 # Creation of master
178 # ------------------
179 # At this point, there always is a master branch: either it existed already
180 # (and was picked interactively as the production branch) or it has just
181 # been created in a fresh repo
182
183 # Creation of develop
184 # -------------------
185 # The develop branch possibly does not exist yet. This is the case when,
186 # in a git init'ed repo with one or more commits, master was picked as the
187 # default production branch and develop was "created". We should create
188 # the develop branch now in that case (we base it on master, of course)
Vincent Driessen7832d6e2010-02-21 21:31:03 +0100189 if ! git_local_branch_exists "$develop_branch"; then
Vincent Driessen3176f742010-03-25 15:30:58 +0100190 git branch --no-track "$develop_branch" "$master_branch"
Vincent Driessen3227d802010-02-20 16:13:23 +0100191 created_gitflow_branch=1
Vincent Driessen0161de52010-02-18 12:07:34 +0100192 fi
193
Vincent Driessen131c2982010-02-20 14:30:16 +0100194 # assert the gitflow repo has been correctly initialized
195 gitflow_is_initialized
Vincent Driessen186d2b52010-01-27 23:48:39 +0100196
Vincent Driessen3227d802010-02-20 16:13:23 +0100197 # switch to develop branch if its newly created
198 if [ $created_gitflow_branch -eq 1 ]; then
199 git checkout -q "$develop_branch"
200 fi
Vincent Driessen61882062010-02-18 12:32:20 +0100201
Vincent Driessenf476d262010-02-20 16:23:47 +0100202 # finally, ask the user for naming conventions (branch and tag prefixes)
Vincent Driessenb1033aa2010-03-23 21:10:13 +0100203 if flag force || \
204 ! git config --get gitflow.prefix.feature >/dev/null 2>&1 ||
205 ! git config --get gitflow.prefix.release >/dev/null 2>&1 ||
206 ! git config --get gitflow.prefix.hotfix >/dev/null 2>&1 ||
207 ! git config --get gitflow.prefix.support >/dev/null 2>&1 ||
208 ! git config --get gitflow.prefix.versiontag >/dev/null 2>&1; then
209 echo
210 echo "How to name your supporting branch prefixes?"
211 fi
Vincent Driessenf476d262010-02-20 16:23:47 +0100212
213 local prefix
214
215 # Feature branches
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100216 if ! git config --get gitflow.prefix.feature >/dev/null 2>&1 || flag force; then
217 default_suggestion=$(git config --get gitflow.prefix.feature || echo feature/)
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100218 printf "Feature branches? [$default_suggestion] "
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100219 read answer
220 [ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
221 git config gitflow.prefix.feature "$prefix"
222 fi
Vincent Driessenf476d262010-02-20 16:23:47 +0100223
224 # Release branches
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100225 if ! git config --get gitflow.prefix.release >/dev/null 2>&1 || flag force; then
226 default_suggestion=$(git config --get gitflow.prefix.release || echo release/)
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100227 printf "Release branches? [$default_suggestion] "
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100228 read answer
229 [ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
230 git config gitflow.prefix.release "$prefix"
231 fi
232
Vincent Driessenf476d262010-02-20 16:23:47 +0100233
234 # Hotfix branches
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100235 if ! git config --get gitflow.prefix.hotfix >/dev/null 2>&1 || flag force; then
236 default_suggestion=$(git config --get gitflow.prefix.hotfix || echo hotfix/)
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100237 printf "Hotfix branches? [$default_suggestion] "
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100238 read answer
239 [ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
240 git config gitflow.prefix.hotfix "$prefix"
241 fi
242
Vincent Driessenf476d262010-02-20 16:23:47 +0100243
244 # Support branches
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100245 if ! git config --get gitflow.prefix.support >/dev/null 2>&1 || flag force; then
246 default_suggestion=$(git config --get gitflow.prefix.support || echo support/)
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100247 printf "Support branches? [$default_suggestion] "
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100248 read answer
249 [ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
250 git config gitflow.prefix.support "$prefix"
251 fi
252
Vincent Driessenf476d262010-02-20 16:23:47 +0100253
254 # Version tag prefix
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100255 if ! git config --get gitflow.prefix.versiontag >/dev/null 2>&1 || flag force; then
256 default_suggestion=$(git config --get gitflow.prefix.versiontag || echo "")
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100257 printf "Version tag prefix? [$default_suggestion] "
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100258 read answer
259 [ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
260 git config gitflow.prefix.versiontag "$prefix"
261 fi
262
Vincent Driessen61882062010-02-18 12:32:20 +0100263
264 # TODO: what to do with origin?
Vincent Driessen186d2b52010-01-27 23:48:39 +0100265}
266
Vincent Driessenb866b012010-01-28 01:01:53 +0100267cmd_help() {
268 usage
269 exit 0
270}