blob: 3726ce0460aca75568aae42b22cade1fb27ed6e3 [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:
Vincent Driessenddb350b2010-07-09 09:42:09 +02006# http://nvie.com/git-model
Vincent Driessen186d2b52010-01-27 23:48:39 +01007#
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() {
Joseph A. Levind2eccaa2011-02-04 21:30:15 -060040 echo "usage: git flow init [-f] [--defaults]"
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
Joseph A. Levind2eccaa2011-02-04 21:30:15 -060052 DEFINE_boolean defaults false 'use default branch names' 'defaults'
Vincent Driessen131c2982010-02-20 14:30:16 +010053 parse_args "$@"
Joseph A. Levind2eccaa2011-02-04 21:30:15 -060054
Vincent Driessen283b0f72010-02-15 23:23:14 +010055 if ! git rev-parse --git-dir >/dev/null 2>&1; then
Vincent Driessen0161de52010-02-18 12:07:34 +010056 git init
57 else
Vincent Driessen131c2982010-02-20 14:30:16 +010058 # assure that we are not working in a repo with local changes
Vincent Driessen7832d6e2010-02-21 21:31:03 +010059 git_repo_is_headless || require_clean_working_tree
Vincent Driessen131c2982010-02-20 14:30:16 +010060 fi
61
62 # running git flow init on an already initialized repo is fine
63 if gitflow_is_initialized && ! flag force; then
64 warn "Already initialized for gitflow."
65 warn "To force reinitialization, use: git flow init -f"
66 exit 0
Vincent Driessen186d2b52010-01-27 23:48:39 +010067 fi
68
Vincent Driessen0161de52010-02-18 12:07:34 +010069 local branch_count
Vincent Driessenf476d262010-02-20 16:23:47 +010070 local answer
Vincent Driessen0161de52010-02-18 12:07:34 +010071
72 # add a master branch if no such branch exists yet
73 local master_branch
Vincent Driessen131c2982010-02-20 14:30:16 +010074 if gitflow_has_master_configured && ! flag force; then
75 master_branch=$(git config --get gitflow.branch.master)
76 else
77 # Two cases are distinguished:
78 # 1. A fresh git repo (without any branches)
79 # We will create a new master/develop branch for the user
80 # 2. Some branches do already exist
81 # We will disallow creation of new master/develop branches and
82 # rather allow to use existing branches for git-flow.
83 local default_suggestion
84 local should_check_existence
Vincent Driessen7832d6e2010-02-21 21:31:03 +010085 branch_count=$(git_local_branches | wc -l)
Vincent Driessen131c2982010-02-20 14:30:16 +010086 if [ "$branch_count" -eq 0 ]; then
87 echo "No branches exist yet. Base branches must be created now."
88 should_check_existence=NO
Vincent Driessenb1033aa2010-03-23 21:10:13 +010089 default_suggestion=$(git config --get gitflow.branch.master || echo master)
Vincent Driessen131c2982010-02-20 14:30:16 +010090 else
91 echo
92 echo "Which branch should be used for bringing forth production releases?"
Vincent Driessen7832d6e2010-02-21 21:31:03 +010093 git_local_branches | sed 's/^.*$/ - &/g'
Vincent Driessen131c2982010-02-20 14:30:16 +010094
95 should_check_existence=YES
96 default_suggestion=
Vincent Driessenb1033aa2010-03-23 21:10:13 +010097 for guess in $(git config --get gitflow.branch.master) \
98 'production' 'main' 'master'; do
Vincent Driessen7832d6e2010-02-21 21:31:03 +010099 if git_local_branch_exists "$guess"; then
Vincent Driessen131c2982010-02-20 14:30:16 +0100100 default_suggestion="$guess"
101 break
102 fi
103 done
Vincent Driessen186d2b52010-01-27 23:48:39 +0100104 fi
Joseph A. Levind2eccaa2011-02-04 21:30:15 -0600105
106 if flag defaults; then
107 warn "Using default branch names."
108 fi
Vincent Driessen131c2982010-02-20 14:30:16 +0100109
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100110 printf "Branch name for production releases: [$default_suggestion] "
Joseph A. Levind2eccaa2011-02-04 21:30:15 -0600111 if ! flag defaults; then
112 read answer
113 else
114 printf "\n"
115 fi
Vincent Driessen131c2982010-02-20 14:30:16 +0100116 master_branch=${answer:-$default_suggestion}
117
118 # check existence in case of an already existing repo
119 if [ "$should_check_existence" = "YES" ]; then
Vincent Driessen7832d6e2010-02-21 21:31:03 +0100120 git_local_branch_exists "$master_branch" || \
Vincent Driessen131c2982010-02-20 14:30:16 +0100121 die "Local branch '$master_branch' does not exist."
122 fi
Vincent Driessen0161de52010-02-18 12:07:34 +0100123
Vincent Driessen61882062010-02-18 12:32:20 +0100124 # store the name of the master branch
125 git config gitflow.branch.master "$master_branch"
Vincent Driessen186d2b52010-01-27 23:48:39 +0100126 fi
127
Vincent Driessen0161de52010-02-18 12:07:34 +0100128 # add a develop branch if no such branch exists yet
129 local develop_branch
Vincent Driessen131c2982010-02-20 14:30:16 +0100130 if gitflow_has_develop_configured && ! flag force; then
131 develop_branch=$(git config --get gitflow.branch.develop)
132 else
133 # Again, the same two cases as with the master selection are
134 # considered (fresh repo or repo that contains branches)
135 local default_suggestion
136 local should_check_existence
Vincent Driessen7832d6e2010-02-21 21:31:03 +0100137 branch_count=$(git_local_branches | grep -v "^${master_branch}\$" | wc -l)
Vincent Driessen131c2982010-02-20 14:30:16 +0100138 if [ "$branch_count" -eq 0 ]; then
139 should_check_existence=NO
Vincent Driessenb1033aa2010-03-23 21:10:13 +0100140 default_suggestion=$(git config --get gitflow.branch.develop || echo develop)
Vincent Driessen131c2982010-02-20 14:30:16 +0100141 else
142 echo
143 echo "Which branch should be used for integration of the \"next release\"?"
Vincent Driessen7832d6e2010-02-21 21:31:03 +0100144 git_local_branches | grep -v "^${master_branch}\$" | sed 's/^.*$/ - &/g'
Vincent Driessen131c2982010-02-20 14:30:16 +0100145
146 should_check_existence=YES
147 default_suggestion=
Vincent Driessenb1033aa2010-03-23 21:10:13 +0100148 for guess in $(git config --get gitflow.branch.develop) \
149 'develop' 'int' 'integration' 'master'; do
Vincent Driessen7832d6e2010-02-21 21:31:03 +0100150 if git_local_branch_exists "$guess"; then
Vincent Driessen131c2982010-02-20 14:30:16 +0100151 default_suggestion="$guess"
152 break
153 fi
154 done
Vincent Driessen0161de52010-02-18 12:07:34 +0100155 fi
Vincent Driessen131c2982010-02-20 14:30:16 +0100156
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100157 printf "Branch name for \"next release\" development: [$default_suggestion] "
Joseph A. Levind2eccaa2011-02-04 21:30:15 -0600158 if ! flag defaults; then
159 read answer
160 else
161 printf "\n"
162 fi
Vincent Driessen131c2982010-02-20 14:30:16 +0100163 develop_branch=${answer:-$default_suggestion}
164
165 if [ "$master_branch" = "$develop_branch" ]; then
166 die "Production and integration branches should differ."
167 fi
168
169 # check existence in case of an already existing repo
170 if [ "$should_check_existence" = "YES" ]; then
Vincent Driessen7832d6e2010-02-21 21:31:03 +0100171 git_local_branch_exists "$develop_branch" || \
Vincent Driessen131c2982010-02-20 14:30:16 +0100172 die "Local branch '$develop_branch' does not exist."
173 fi
Vincent Driessen0161de52010-02-18 12:07:34 +0100174
Vincent Driessen61882062010-02-18 12:32:20 +0100175 # store the name of the develop branch
176 git config gitflow.branch.develop "$develop_branch"
Vincent Driessen0161de52010-02-18 12:07:34 +0100177 fi
178
Vincent Driessen131c2982010-02-20 14:30:16 +0100179 # Creation of HEAD
180 # ----------------
181 # We create a HEAD now, if it does not exist yet (in a fresh repo). We need
182 # it to be able to create new branches.
Vincent Driessen3227d802010-02-20 16:13:23 +0100183 local created_gitflow_branch=0
Vincent Driessen0161de52010-02-18 12:07:34 +0100184 if ! git rev-parse --quiet --verify HEAD >/dev/null 2>&1; then
Vincent Driessen0161de52010-02-18 12:07:34 +0100185 git symbolic-ref HEAD "refs/heads/$master_branch"
Vincent Driessen61882062010-02-18 12:32:20 +0100186 git commit --allow-empty --quiet -m "Initial commit"
Vincent Driessen3227d802010-02-20 16:13:23 +0100187 created_gitflow_branch=1
Vincent Driessen0161de52010-02-18 12:07:34 +0100188 fi
189
Vincent Driessen131c2982010-02-20 14:30:16 +0100190 # Creation of master
191 # ------------------
192 # At this point, there always is a master branch: either it existed already
193 # (and was picked interactively as the production branch) or it has just
194 # been created in a fresh repo
195
196 # Creation of develop
197 # -------------------
198 # The develop branch possibly does not exist yet. This is the case when,
199 # in a git init'ed repo with one or more commits, master was picked as the
200 # default production branch and develop was "created". We should create
201 # the develop branch now in that case (we base it on master, of course)
Vincent Driessen7832d6e2010-02-21 21:31:03 +0100202 if ! git_local_branch_exists "$develop_branch"; then
Vincent Driessen3176f742010-03-25 15:30:58 +0100203 git branch --no-track "$develop_branch" "$master_branch"
Vincent Driessen3227d802010-02-20 16:13:23 +0100204 created_gitflow_branch=1
Vincent Driessen0161de52010-02-18 12:07:34 +0100205 fi
206
Vincent Driessen131c2982010-02-20 14:30:16 +0100207 # assert the gitflow repo has been correctly initialized
208 gitflow_is_initialized
Vincent Driessen186d2b52010-01-27 23:48:39 +0100209
Vincent Driessen3227d802010-02-20 16:13:23 +0100210 # switch to develop branch if its newly created
211 if [ $created_gitflow_branch -eq 1 ]; then
212 git checkout -q "$develop_branch"
213 fi
Vincent Driessen61882062010-02-18 12:32:20 +0100214
Vincent Driessenf476d262010-02-20 16:23:47 +0100215 # finally, ask the user for naming conventions (branch and tag prefixes)
Vincent Driessenb1033aa2010-03-23 21:10:13 +0100216 if flag force || \
217 ! git config --get gitflow.prefix.feature >/dev/null 2>&1 ||
218 ! git config --get gitflow.prefix.release >/dev/null 2>&1 ||
219 ! git config --get gitflow.prefix.hotfix >/dev/null 2>&1 ||
220 ! git config --get gitflow.prefix.support >/dev/null 2>&1 ||
221 ! git config --get gitflow.prefix.versiontag >/dev/null 2>&1; then
222 echo
223 echo "How to name your supporting branch prefixes?"
224 fi
Vincent Driessenf476d262010-02-20 16:23:47 +0100225
226 local prefix
227
228 # Feature branches
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100229 if ! git config --get gitflow.prefix.feature >/dev/null 2>&1 || flag force; then
230 default_suggestion=$(git config --get gitflow.prefix.feature || echo feature/)
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100231 printf "Feature branches? [$default_suggestion] "
Joseph A. Levind2eccaa2011-02-04 21:30:15 -0600232 if ! flag defaults; then
233 read answer
234 else
235 printf "\n"
236 fi
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100237 [ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
238 git config gitflow.prefix.feature "$prefix"
239 fi
Vincent Driessenf476d262010-02-20 16:23:47 +0100240
241 # Release branches
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100242 if ! git config --get gitflow.prefix.release >/dev/null 2>&1 || flag force; then
243 default_suggestion=$(git config --get gitflow.prefix.release || echo release/)
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100244 printf "Release branches? [$default_suggestion] "
Joseph A. Levind2eccaa2011-02-04 21:30:15 -0600245 if ! flag defaults; then
246 read answer
247 else
248 printf "\n"
249 fi
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100250 [ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
251 git config gitflow.prefix.release "$prefix"
252 fi
253
Vincent Driessenf476d262010-02-20 16:23:47 +0100254
255 # Hotfix branches
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100256 if ! git config --get gitflow.prefix.hotfix >/dev/null 2>&1 || flag force; then
257 default_suggestion=$(git config --get gitflow.prefix.hotfix || echo hotfix/)
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100258 printf "Hotfix branches? [$default_suggestion] "
Joseph A. Levind2eccaa2011-02-04 21:30:15 -0600259 if ! flag defaults; then
260 read answer
261 else
262 printf "\n"
263 fi
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100264 [ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
265 git config gitflow.prefix.hotfix "$prefix"
266 fi
267
Vincent Driessenf476d262010-02-20 16:23:47 +0100268
269 # Support branches
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100270 if ! git config --get gitflow.prefix.support >/dev/null 2>&1 || flag force; then
271 default_suggestion=$(git config --get gitflow.prefix.support || echo support/)
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100272 printf "Support branches? [$default_suggestion] "
Joseph A. Levind2eccaa2011-02-04 21:30:15 -0600273 if ! flag defaults; then
274 read answer
275 else
276 printf "\n"
277 fi
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100278 [ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
279 git config gitflow.prefix.support "$prefix"
280 fi
281
Vincent Driessenf476d262010-02-20 16:23:47 +0100282
283 # Version tag prefix
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100284 if ! git config --get gitflow.prefix.versiontag >/dev/null 2>&1 || flag force; then
285 default_suggestion=$(git config --get gitflow.prefix.versiontag || echo "")
Vincent Driessenf6228ed2010-03-23 21:19:54 +0100286 printf "Version tag prefix? [$default_suggestion] "
Joseph A. Levind2eccaa2011-02-04 21:30:15 -0600287 if ! flag defaults; then
288 read answer
289 else
290 printf "\n"
291 fi
Vincent Driessen1d8bb0d2010-02-20 16:46:38 +0100292 [ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
293 git config gitflow.prefix.versiontag "$prefix"
294 fi
295
Vincent Driessen61882062010-02-18 12:32:20 +0100296
297 # TODO: what to do with origin?
Vincent Driessen186d2b52010-01-27 23:48:39 +0100298}
299
Vincent Driessenb866b012010-01-28 01:01:53 +0100300cmd_help() {
301 usage
302 exit 0
303}