This repository has been archived by the owner on Nov 28, 2023. It is now read-only.
forked from nvie/gitflow
-
Notifications
You must be signed in to change notification settings - Fork 96
/
git-hf-init
357 lines (319 loc) · 11.8 KB
/
git-hf-init
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
#
# HubFlow - a fork of the git-flow tools to apply Vincent Driessen's
# branching model to working with GitHub
#
# Original blog post presenting this model is found at:
# http://nvie.com/git-model
#
# The HubFlow documentation is found at:
# http://datasift.github.com/gitflow/
#
# Feel free to contribute to this project at:
# http://github.com/datasift/gitflow
#
# Copyright 2010 Vincent Driessen. All rights reserved.
# Copyright 2012 MediaSift Ltd. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY VINCENT DRIESSEN ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL VINCENT DRIESSEN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# The views and conclusions contained in the software and documentation are
# those of the authors and should not be interpreted as representing official
# policies, either expressed or implied, of Vincent Driessen.
#
usage() {
echo "usage: git hf init [-af]"
}
parse_args() {
# parse options
FLAGS "$@" || exit $?
eval set -- "${FLAGS_ARGV}"
}
# Default entry when no SUBACTION is given
cmd_default() {
DEFINE_boolean force false 'force setting of hubflow branches, even if already configured' f
DEFINE_boolean ask false 'ask for branch naming conventions' a
parse_args "$@"
if ! git rev-parse --git-dir >/dev/null 2>&1; then
git init
else
# assure that we are not working in a repo with local changes
git_repo_is_headless || require_clean_working_tree
fi
# running git hf init on an already initialized repo is fine
if hubflow_is_initialized && ! flag force; then
warn "Already initialized for hubflow."
warn "To force reinitialization, use: git hf init -f"
exit 0
fi
local branch_count
local answer
if noflag ask; then
warn "Using default branch names."
fi
# add a master branch if no such branch exists yet
local master_branch
if hubflow_has_master_configured && ! flag force; then
master_branch=$(git config --get hubflow.branch.master)
else
# Two cases are distinguished:
# 1. A fresh git repo (without any branches)
# We will create a new master/develop branch for the user
# 2. Some branches do already exist
# We will disallow creation of new master/develop branches and
# rather allow to use existing branches for hubflow.
local default_suggestion
local should_check_existence
branch_count=$(git_local_branches | wc -l)
if [ "$branch_count" -eq 0 ]; then
echo "No branches exist yet. Base branches must be created now."
should_check_existence=NO
default_suggestion=$(git config --get hubflow.branch.master || echo master)
else
echo
echo "Which branch should be used for tracking production releases?"
git_local_branches | sed 's/^.*$/ - &/g'
should_check_existence=YES
default_suggestion=
for guess in $(git config --get hubflow.branch.master) \
'production' 'main' 'master'; do
if git_local_branch_exists "$guess"; then
default_suggestion="$guess"
break
fi
done
if [ -z "$default_suggestion" ] ; then
for guess in $(git config --get hubflow.branch.master) \
'production' 'main' 'master'; do
if git_remote_branch_exists "origin/$guess"; then
default_suggestion="$guess"
break
fi
done
fi
# if we have no default at this point, use 'master'
if [ -z "$default_suggestion" ] ; then
default_suggestion="master"
should_check_existence="NO"
fi
fi
printf "Branch name for production releases: [$default_suggestion] "
if flag ask; then
read answer
else
printf "\n"
fi
master_branch=${answer:-$default_suggestion}
# check existence in case of an already existing repo
if [ "$should_check_existence" = "YES" ]; then
# if no local branch exists and a remote branch of the same
# name exists, checkout that branch and use it for master
if ! git_local_branch_exists "$master_branch" && \
git_remote_branch_exists "origin/$master_branch"; then
git branch "$master_branch" "origin/$master_branch" >/dev/null 2>&1
elif ! git_local_branch_exists "$master_branch"; then
die "Local branch '$master_branch' does not exist."
fi
fi
# store the name of the master branch
git config hubflow.branch.master "$master_branch"
fi
# add a develop branch if no such branch exists yet
local develop_branch
if hubflow_has_develop_configured && ! flag force; then
develop_branch=$(git config --get hubflow.branch.develop)
else
# Again, the same two cases as with the master selection are
# considered (fresh repo or repo that contains branches)
local default_suggestion
local should_check_existence
branch_count=$(git_local_branches | grep -v "^${master_branch}\$" | wc -l)
if [ "$branch_count" -eq 0 ]; then
should_check_existence=NO
default_suggestion=$(git config --get hubflow.branch.develop || echo develop)
else
echo
echo "Which branch should be used for integration of the \"next release\"?"
git_local_branches | grep -v "^${master_branch}\$" | sed 's/^.*$/ - &/g'
should_check_existence=YES
default_suggestion=
for guess in $(git config --get hubflow.branch.develop) \
'develop' 'int' 'integration' 'master'; do
if git_local_branch_exists "$guess"; then
default_suggestion="$guess"
break
fi
done
if [ -z "$default_suggestion" ]; then
for guess in $(git config --get hubflow.branch.develop) \
'develop' 'int' 'integration' 'master'; do
if git_remote_branch_exists "origin/$guess"; then
default_suggestion="$guess"
break
fi
done
fi
fi
printf "Branch name for \"next release\" development: [$default_suggestion] "
if flag ask; then
read answer
else
printf "\n"
fi
develop_branch=${answer:-$default_suggestion}
if [ "$master_branch" = "$develop_branch" ]; then
die "Production and integration branches should differ."
fi
# check existence in case of an already existing repo
if [ "$should_check_existence" = "YES" ]; then
git_local_branch_exists "$develop_branch" || \
die "Local branch '$develop_branch' does not exist."
fi
# store the name of the develop branch
git config hubflow.branch.develop "$develop_branch"
fi
# Creation of HEAD
# ----------------
# We create a HEAD now, if it does not exist yet (in a fresh repo). We need
# it to be able to create new branches.
local created_hubflow_branch=0
if ! git rev-parse --quiet --verify HEAD >/dev/null 2>&1; then
git symbolic-ref HEAD "refs/heads/$master_branch"
git commit --allow-empty --quiet -m "Initial commit"
created_hubflow_branch=1
fi
# Creation of master
# ------------------
# We cannot safely assume that the master branch actually exists. It will
# exist nearly all of the time, but this deals with those rare occaisons
# when the master branch needs setting up
if ! git_local_branch_exists "$master_branch"; then
if git_remote_branch_exists "origin/$master_branch"; then
git branch "$develop_branch" "origin/$master_branch" >/dev/null 2>&1
else
git branch --no-track "$master_branch"
fi
created_hubflow_branch=1
fi
# Creation of develop
# -------------------
# The develop branch possibly does not exist yet. This is the case when,
# in a git init'ed repo with one or more commits, master was picked as the
# default production branch and develop was "created". We should create
# the develop branch now in that case (we base it on master, of course)
if ! git_local_branch_exists "$develop_branch"; then
if git_remote_branch_exists "origin/$develop_branch"; then
git branch "$develop_branch" "origin/$develop_branch" >/dev/null 2>&1
else
git branch --no-track "$develop_branch" "$master_branch"
fi
created_hubflow_branch=1
fi
# assert the hubflow repo has been correctly initialized
hubflow_is_initialized
# switch to develop branch if its newly created
if [ $created_hubflow_branch -eq 1 ]; then
git checkout -q "$develop_branch"
fi
# finally, ask the user for naming conventions (branch and tag prefixes)
if flag force || \
! git config --get hubflow.prefix.feature >/dev/null 2>&1 ||
! git config --get hubflow.prefix.release >/dev/null 2>&1 ||
! git config --get hubflow.prefix.hotfix >/dev/null 2>&1 ||
! git config --get hubflow.prefix.support >/dev/null 2>&1 ||
! git config --get hubflow.prefix.versiontag >/dev/null 2>&1; then
echo
echo "How to name your supporting branch prefixes?"
fi
local prefix
# Feature branches
if ! git config --get hubflow.prefix.feature >/dev/null 2>&1 || flag force; then
default_suggestion=$(git config --get hubflow.prefix.feature || echo feature/)
printf "Feature branches? [$default_suggestion] "
if flag ask; then
read answer
else
printf "\n"
fi
[ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
git config hubflow.prefix.feature "$prefix"
fi
# Release branches
if ! git config --get hubflow.prefix.release >/dev/null 2>&1 || flag force; then
default_suggestion=$(git config --get hubflow.prefix.release || echo release/)
printf "Release branches? [$default_suggestion] "
if flag ask; then
read answer
else
printf "\n"
fi
[ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
git config hubflow.prefix.release "$prefix"
fi
# Hotfix branches
if ! git config --get hubflow.prefix.hotfix >/dev/null 2>&1 || flag force; then
default_suggestion=$(git config --get hubflow.prefix.hotfix || echo hotfix/)
printf "Hotfix branches? [$default_suggestion] "
if flag ask; then
read answer
else
printf "\n"
fi
[ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
git config hubflow.prefix.hotfix "$prefix"
fi
# Support branches
if ! git config --get hubflow.prefix.support >/dev/null 2>&1 || flag force; then
default_suggestion=$(git config --get hubflow.prefix.support || echo support/)
printf "Support branches? [$default_suggestion] "
if flag ask; then
read answer
else
printf "\n"
fi
[ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
git config hubflow.prefix.support "$prefix"
fi
# Version tag prefix
if ! git config --get hubflow.prefix.versiontag >/dev/null 2>&1 || flag force; then
default_suggestion=$(git config --get hubflow.prefix.versiontag || echo "")
printf "Version tag prefix? [$default_suggestion] "
if flag ask; then
read answer
else
printf "\n"
fi
[ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
git config hubflow.prefix.versiontag "$prefix"
fi
# at this point, we should be on the develop branch, which may or
# may not exist at origin
#
# Load the settings that were just written so that $ORIGIN,
# etc. are properly defined
hubflow_load_settings
# push up to origin, in case this branch does not exist there (yet)
hubflow_push_latest_changes_to_origin
}
cmd_help() {
usage
exit 0
}