Skip to content
This repository
Newer
Older
100644 349 lines (313 sloc) 10.812 kb
00ccea60 » hollow
2010-01-26 refactor the whole thing
1 #
6c2d30bb »
2010-01-26 Structurally replace gitflow by git-flow, as a true git extension.
2 # git-flow -- A collection of Git extensions to provide high-level
3 # repository operations for Vincent Driessen's branching model.
00ccea60 » hollow
2010-01-26 refactor the whole thing
4 #
5 # Original blog post presenting this model is found at:
ddb350b3 »
2010-07-09 Change the URL of the original blog post.
6 # http://nvie.com/git-model
00ccea60 » hollow
2010-01-26 refactor the whole thing
7 #
8 # Feel free to contribute to this project at:
9 # http://github.com/nvie/gitflow
10 #
d72acbaf »
2010-04-04 Added inline license terms to all source files.
11 # 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.
00ccea60 » hollow
2010-01-26 refactor the whole thing
37 #
38
dc902eda » pcragone
2012-04-21 Added 'init()' function to git-flow-{feature,release,hotfix,support},…
39 init() {
40 require_git_repo
41 require_gitflow_initialized
42 gitflow_load_settings
43 VERSION_PREFIX=$(eval "echo `git config --get gitflow.prefix.versiontag`")
44 PREFIX=$(git config --get gitflow.prefix.hotfix)
45 }
49dd62b7 » hollow
2010-01-28 refactor git config calls to global variables
46
00ccea60 » hollow
2010-01-26 refactor the whole thing
47 usage() {
3c337fb5 »
2010-02-04 Added -v (--verbose) flags to list subaction of all subcommands.
48 echo "usage: git flow hotfix [list] [-v]"
a2e41163 »
2010-02-24 Document all available flags in all of the subcommand synopsis texts.
49 echo " git flow hotfix start [-F] <version> [<base>]"
8fee0c22 » gjherbiet
2010-10-04 Added -k option to keep (feature|hotfix|relase) branch when calling '…
50 echo " git flow hotfix finish [-Fsumpk] <version>"
0b324def » phoet
2011-11-12 add publishing to hotfix
51 echo " git flow hotfix publish <version>"
37f7d14b » vedang
2012-03-12 Added a track command to git-flow-hotfix along the lines of the git-f…
52 echo " git flow hotfix track <version>"
00ccea60 » hollow
2010-01-26 refactor the whole thing
53 }
54
186d2b5f »
2010-01-27 Refactored the subcommand invocation logic to form a more hierarchica…
55 cmd_default() {
b866b01b »
2010-01-28 Give all subcommands an optional setup() function that will be called…
56 cmd_list "$@"
00ccea60 » hollow
2010-01-26 refactor the whole thing
57 }
58
b866b01b »
2010-01-28 Give all subcommands an optional setup() function that will be called…
59 cmd_list() {
3c337fb5 »
2010-02-04 Added -v (--verbose) flags to list subaction of all subcommands.
60 DEFINE_boolean verbose false 'verbose (more) output' v
61 parse_args "$@"
62
f46e2903 »
2010-02-15 Replaced all 'typeset' and 'typeset -i' calls by 'local', as adviced on:
63 local hotfix_branches
64 local current_branch
65 local short_names
7832d6ef »
2010-02-21 Better naming of common functions categorizing them into common,
66 hotfix_branches=$(echo "$(git_local_branches)" | grep "^$PREFIX")
27592dd7 »
2010-02-06 Tidy up:
67 if [ -z "$hotfix_branches" ]; then
186d2b5f »
2010-01-27 Refactored the subcommand invocation logic to form a more hierarchica…
68 warn "No hotfix branches exist."
b681b452 » Zoramite
2010-06-26 Adding extra instructions when running the list option without any co…
69 warn ""
70 warn "You can start a new hotfix branch:"
71 warn ""
c4d0cb15 » sos4nt
2010-12-02 fixed typo
72 warn " git flow hotfix start <version> [<base>]"
4de01f25 » Zoramite
2010-06-26 Adding an extra line to the output for extra spacing.
73 warn ""
186d2b5f »
2010-01-27 Refactored the subcommand invocation logic to form a more hierarchica…
74 exit 0
75 fi
cf3da5a7 » adamgibbins
2010-08-22 Fixed incorrect color flag
76 current_branch=$(git branch --no-color | grep '^\* ' | grep -v 'no branch' | sed 's/^* //g')
68845235 »
2010-02-10 Use space (' ') instead of '?' as a pattern terminator.
77 short_names=$(echo "$hotfix_branches" | sed "s ^$PREFIX g")
3c337fb5 »
2010-02-04 Added -v (--verbose) flags to list subaction of all subcommands.
78
79 # determine column width first
f46e2903 »
2010-02-15 Replaced all 'typeset' and 'typeset -i' calls by 'local', as adviced on:
80 local width=0
81 local branch
27592dd7 »
2010-02-06 Tidy up:
82 for branch in $short_names; do
f46e2903 »
2010-02-15 Replaced all 'typeset' and 'typeset -i' calls by 'local', as adviced on:
83 local len=${#branch}
3c337fb5 »
2010-02-04 Added -v (--verbose) flags to list subaction of all subcommands.
84 width=$(max $width $len)
85 done
f46e2903 »
2010-02-15 Replaced all 'typeset' and 'typeset -i' calls by 'local', as adviced on:
86 width=$(($width+3))
3c337fb5 »
2010-02-04 Added -v (--verbose) flags to list subaction of all subcommands.
87
f46e2903 »
2010-02-15 Replaced all 'typeset' and 'typeset -i' calls by 'local', as adviced on:
88 local branch
27592dd7 »
2010-02-06 Tidy up:
89 for branch in $short_names; do
f46e2903 »
2010-02-15 Replaced all 'typeset' and 'typeset -i' calls by 'local', as adviced on:
90 local fullname=$PREFIX$branch
91 local base=$(git merge-base "$fullname" "$MASTER_BRANCH")
92 local master_sha=$(git rev-parse "$MASTER_BRANCH")
93 local branch_sha=$(git rev-parse "$fullname")
27592dd7 »
2010-02-06 Tidy up:
94 if [ "$fullname" = "$current_branch" ]; then
3c337fb5 »
2010-02-04 Added -v (--verbose) flags to list subaction of all subcommands.
95 printf "* "
96 else
97 printf " "
98 fi
99 if flag verbose; then
100 printf "%-${width}s" "$branch"
101 if [ "$branch_sha" = "$master_sha" ]; then
102 printf "(no commits yet)"
103 else
f46e2903 »
2010-02-15 Replaced all 'typeset' and 'typeset -i' calls by 'local', as adviced on:
104 local tagname=$(git name-rev --tags --no-undefined --name-only "$base")
105 local nicename
3c337fb5 »
2010-02-04 Added -v (--verbose) flags to list subaction of all subcommands.
106 if [ "$tagname" != "" ]; then
c5fcc01a »
2010-02-10 Do not quote variable assignments.
107 nicename=$tagname
3c337fb5 »
2010-02-04 Added -v (--verbose) flags to list subaction of all subcommands.
108 else
a4dd223d »
2010-02-10 Quote all variables in function/program arguments.
109 nicename=$(git rev-parse --short "$base")
3c337fb5 »
2010-02-04 Added -v (--verbose) flags to list subaction of all subcommands.
110 fi
111 printf "(based on $nicename)"
112 fi
113 else
114 printf "%s" "$branch"
115 fi
116 echo
117 done
186d2b5f »
2010-01-27 Refactored the subcommand invocation logic to form a more hierarchica…
118 }
119
00ccea60 » hollow
2010-01-26 refactor the whole thing
120 cmd_help() {
121 usage
122 exit 0
123 }
124
b866b01b »
2010-01-28 Give all subcommands an optional setup() function that will be called…
125 parse_args() {
3c337fb5 »
2010-02-04 Added -v (--verbose) flags to list subaction of all subcommands.
126 # parse options
127 FLAGS "$@" || exit $?
128 eval set -- "${FLAGS_ARGV}"
129
130 # read arguments into global variables
f1eaa4e0 »
2011-02-03 Don't just take the last argument, take the first.
131 VERSION=$1
3c337fb5 »
2010-02-04 Added -v (--verbose) flags to list subaction of all subcommands.
132 BRANCH=$PREFIX$VERSION
133 }
134
135 require_version_arg() {
b866b01b »
2010-01-28 Give all subcommands an optional setup() function that will be called…
136 if [ "$VERSION" = "" ]; then
3c337fb5 »
2010-02-04 Added -v (--verbose) flags to list subaction of all subcommands.
137 warn "Missing argument <version>"
b866b01b »
2010-01-28 Give all subcommands an optional setup() function that will be called…
138 usage
139 exit 1
140 fi
141 }
142
010252a8 »
2010-02-04 Added an optional <base> argument to all start subactions.
143 require_base_is_on_master() {
cf3da5a7 » adamgibbins
2010-08-22 Fixed incorrect color flag
144 if ! git branch --no-color --contains "$BASE" 2>/dev/null \
010252a8 »
2010-02-04 Added an optional <base> argument to all start subactions.
145 | sed 's/[* ] //g' \
146 | grep -q "^$MASTER_BRANCH\$"; then
147 die "fatal: Given base '$BASE' is not a valid commit on '$MASTER_BRANCH'."
148 fi
149 }
150
6d64d2c3 »
2010-02-16 Add check to disallow creation of a new release/hotfix branch when there
151 require_no_existing_hotfix_branches() {
7832d6ef »
2010-02-21 Better naming of common functions categorizing them into common,
152 local hotfix_branches=$(echo "$(git_local_branches)" | grep "^$PREFIX")
6d64d2c3 »
2010-02-16 Add check to disallow creation of a new release/hotfix branch when there
153 local first_branch=$(echo ${hotfix_branches} | head -n1)
154 first_branch=${first_branch#$PREFIX}
155 [ -z "$hotfix_branches" ] || \
156 die "There is an existing hotfix branch ($first_branch). Finish that one first."
157 }
158
00ccea60 » hollow
2010-01-26 refactor the whole thing
159 cmd_start() {
de95e004 »
2010-07-22 Change the default behaviour of all scripts to NOT fetch.
160 DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
00ccea60 » hollow
2010-01-26 refactor the whole thing
161 parse_args "$@"
c5fcc01a »
2010-02-10 Do not quote variable assignments.
162 BASE=${2:-$MASTER_BRANCH}
010252a8 »
2010-02-04 Added an optional <base> argument to all start subactions.
163 require_version_arg
164 require_base_is_on_master
6d64d2c3 »
2010-02-16 Add check to disallow creation of a new release/hotfix branch when there
165 require_no_existing_hotfix_branches
00ccea60 » hollow
2010-01-26 refactor the whole thing
166
167 # sanity checks
7832d6ef »
2010-02-21 Better naming of common functions categorizing them into common,
168 require_clean_working_tree
169 require_branch_absent "$BRANCH"
170 require_tag_absent "$VERSION_PREFIX$VERSION"
ca73caf8 »
2010-02-07 Replaced all old-style flag variables by shFlags-style flag variables.
171 if flag fetch; then
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
172 git_do fetch -q "$ORIGIN" "$MASTER_BRANCH"
2acfffd9 »
2010-01-29 Make the 'to fetch or not to fetch' flag explicit in the other comman…
173 fi
f6fcc4ee » Konstantin Tjuterev
2011-04-14 - Removed quoting in has $SOME_BRANCH $(get_remote_branches), as the …
174 if has "$ORIGIN/$MASTER_BRANCH" $(git_remote_branches); then
de95e004 »
2010-07-22 Change the default behaviour of all scripts to NOT fetch.
175 require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
176 fi
00ccea60 » hollow
2010-01-26 refactor the whole thing
177
178 # create branch
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
179 git_do checkout -b "$BRANCH" "$BASE"
00ccea60 » hollow
2010-01-26 refactor the whole thing
180
181 echo
182 echo "Summary of actions:"
183 echo "- A new branch '$BRANCH' was created, based on '$BASE'"
184 echo "- You are now on branch '$BRANCH'"
185 echo
186 echo "Follow-up actions:"
187 echo "- Bump the version number now!"
188 echo "- Start committing your hot fixes"
189 echo "- When done, run:"
190 echo
010252a8 »
2010-02-04 Added an optional <base> argument to all start subactions.
191 echo " git flow hotfix finish '$VERSION'"
00ccea60 » hollow
2010-01-26 refactor the whole thing
192 echo
193 }
194
0b324def » phoet
2011-11-12 add publishing to hotfix
195 cmd_publish() {
196 parse_args "$@"
197 require_version_arg
198
199 # sanity checks
200 require_clean_working_tree
201 require_branch "$BRANCH"
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
202 git_do fetch -q "$ORIGIN"
0b324def » phoet
2011-11-12 add publishing to hotfix
203 require_branch_absent "$ORIGIN/$BRANCH"
204
205 # create remote branch
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
206 git_do push "$ORIGIN" "$BRANCH:refs/heads/$BRANCH"
207 git_do fetch -q "$ORIGIN"
0b324def » phoet
2011-11-12 add publishing to hotfix
208
209 # configure remote tracking
210 git config "branch.$BRANCH.remote" "$ORIGIN"
211 git config "branch.$BRANCH.merge" "refs/heads/$BRANCH"
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
212 git_do checkout "$BRANCH"
0b324def » phoet
2011-11-12 add publishing to hotfix
213
214 echo
215 echo "Summary of actions:"
216 echo "- A new remote branch '$BRANCH' was created"
217 echo "- The local branch '$BRANCH' was configured to track the remote branch"
218 echo "- You are now on branch '$BRANCH'"
219 echo
220 }
221
37f7d14b » vedang
2012-03-12 Added a track command to git-flow-hotfix along the lines of the git-f…
222 cmd_track() {
223 parse_args "$@"
224 require_version_arg
225
226 # sanity checks
227 require_clean_working_tree
228 require_branch_absent "$BRANCH"
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
229 git_do fetch -q "$ORIGIN"
37f7d14b » vedang
2012-03-12 Added a track command to git-flow-hotfix along the lines of the git-f…
230 require_branch "$ORIGIN/$BRANCH"
231
232 # create tracking branch
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
233 git_do checkout -b "$BRANCH" "$ORIGIN/$BRANCH"
37f7d14b » vedang
2012-03-12 Added a track command to git-flow-hotfix along the lines of the git-f…
234
235 echo
236 echo "Summary of actions:"
237 echo "- A new remote tracking branch '$BRANCH' was created"
238 echo "- You are now on branch '$BRANCH'"
239 echo
240 }
241
00ccea60 » hollow
2010-01-26 refactor the whole thing
242 cmd_finish() {
de95e004 »
2010-07-22 Change the default behaviour of all scripts to NOT fetch.
243 DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
1a2868b8 »
2010-02-07 Add tag annotation and tag signing to both release and hotfix.
244 DEFINE_boolean sign false "sign the release tag cryptographically" s
245 DEFINE_string signingkey "" "use the given GPG-key for the digital signature (implies -s)" u
246 DEFINE_string message "" "use the given tag message" m
2e9ab49e » sinbad
2012-06-08 Support reading the tag message from a file in release/hotfix finish
247 DEFINE_string messagefile "" "use the contents of the given file as tag message" f
ddba2df9 »
2010-02-19 Fix spacing issues.
248 DEFINE_boolean push false "push to $ORIGIN after performing finish" p
ddd9dfe9 »
2010-10-05 Tidy up a bit.
249 DEFINE_boolean keep false "keep branch after performing finish" k
ca8be527 »
2010-10-05 Allow finishing release branches without creating a tag.
250 DEFINE_boolean notag false "don't tag this release" n
00ccea60 » hollow
2010-01-26 refactor the whole thing
251 parse_args "$@"
010252a8 »
2010-02-04 Added an optional <base> argument to all start subactions.
252 require_version_arg
00ccea60 » hollow
2010-01-26 refactor the whole thing
253
1a2868b8 »
2010-02-07 Add tag annotation and tag signing to both release and hotfix.
254 # handle flags that imply other flags
255 if [ "$FLAGS_signingkey" != "" ]; then
256 FLAGS_sign=$FLAGS_TRUE
257 fi
258
00ccea60 » hollow
2010-01-26 refactor the whole thing
259 # sanity checks
7832d6ef »
2010-02-21 Better naming of common functions categorizing them into common,
260 require_branch "$BRANCH"
261 require_clean_working_tree
ca73caf8 »
2010-02-07 Replaced all old-style flag variables by shFlags-style flag variables.
262 if flag fetch; then
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
263 git_do fetch -q "$ORIGIN" "$MASTER_BRANCH" || \
1a2868b8 »
2010-02-07 Add tag annotation and tag signing to both release and hotfix.
264 die "Could not fetch $MASTER_BRANCH from $ORIGIN."
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
265 git_do fetch -q "$ORIGIN" "$DEVELOP_BRANCH" || \
1a2868b8 »
2010-02-07 Add tag annotation and tag signing to both release and hotfix.
266 die "Could not fetch $DEVELOP_BRANCH from $ORIGIN."
2acfffd9 »
2010-01-29 Make the 'to fetch or not to fetch' flag explicit in the other comman…
267 fi
f6fcc4ee » Konstantin Tjuterev
2011-04-14 - Removed quoting in has $SOME_BRANCH $(get_remote_branches), as the …
268 if has "$ORIGIN/$MASTER_BRANCH" $(git_remote_branches); then
de95e004 »
2010-07-22 Change the default behaviour of all scripts to NOT fetch.
269 require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
270 fi
f6fcc4ee » Konstantin Tjuterev
2011-04-14 - Removed quoting in has $SOME_BRANCH $(get_remote_branches), as the …
271 if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
de95e004 »
2010-07-22 Change the default behaviour of all scripts to NOT fetch.
272 require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
273 fi
00ccea60 » hollow
2010-01-26 refactor the whole thing
274
5fa4758e »
2010-02-09 Made the finishing of release/hotfix branches fail-safe. When a
275 # try to merge into master
276 # in case a previous attempt to finish this release branch has failed,
277 # but the merge into master was successful, we skip it now
7832d6ef »
2010-02-21 Better naming of common functions categorizing them into common,
278 if ! git_is_branch_merged_into "$BRANCH" "$MASTER_BRANCH"; then
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
279 git_do checkout "$MASTER_BRANCH" || \
5fa4758e »
2010-02-09 Made the finishing of release/hotfix branches fail-safe. When a
280 die "Could not check out $MASTER_BRANCH."
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
281 git_do merge --no-ff "$BRANCH" || \
5fa4758e »
2010-02-09 Made the finishing of release/hotfix branches fail-safe. When a
282 die "There were merge conflicts."
283 # TODO: What do we do now?
284 fi
285
ca8be527 »
2010-10-05 Allow finishing release branches without creating a tag.
286 if noflag notag; then
287 # try to tag the release
288 # in case a previous attempt to finish this release branch has failed,
289 # but the tag was set successful, we skip it now
290 local tagname=$VERSION_PREFIX$VERSION
291 if ! git_tag_exists "$tagname"; then
292 local opts="-a"
293 flag sign && opts="$opts -s"
294 [ "$FLAGS_signingkey" != "" ] && opts="$opts -u '$FLAGS_signingkey'"
295 [ "$FLAGS_message" != "" ] && opts="$opts -m '$FLAGS_message'"
2e9ab49e » sinbad
2012-06-08 Support reading the tag message from a file in release/hotfix finish
296 [ "$FLAGS_messagefile" != "" ] && opts="$opts -F '$FLAGS_messagefile'"
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
297 eval git_do tag $opts "$VERSION_PREFIX$VERSION" "$BRANCH" || \
ca8be527 »
2010-10-05 Allow finishing release branches without creating a tag.
298 die "Tagging failed. Please run finish again to retry."
299 fi
5fa4758e »
2010-02-09 Made the finishing of release/hotfix branches fail-safe. When a
300 fi
301
302 # try to merge into develop
303 # in case a previous attempt to finish this release branch has failed,
304 # but the merge into develop was successful, we skip it now
7832d6ef »
2010-02-21 Better naming of common functions categorizing them into common,
305 if ! git_is_branch_merged_into "$BRANCH" "$DEVELOP_BRANCH"; then
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
306 git_do checkout "$DEVELOP_BRANCH" || \
5fa4758e »
2010-02-09 Made the finishing of release/hotfix branches fail-safe. When a
307 die "Could not check out $DEVELOP_BRANCH."
308
d29e315f »
2010-02-09 Annotated the code with some TODO-notes.
309 # TODO: Actually, accounting for 'git describe' pays, so we should
310 # ideally git merge --no-ff $tagname here, instead!
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
311 git_do merge --no-ff "$BRANCH" || \
5fa4758e »
2010-02-09 Made the finishing of release/hotfix branches fail-safe. When a
312 die "There were merge conflicts."
313 # TODO: What do we do now?
314 fi
00ccea60 » hollow
2010-01-26 refactor the whole thing
315
316 # delete branch
ddd9dfe9 »
2010-10-05 Tidy up a bit.
317 if noflag keep; then
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
318 git_do branch -d "$BRANCH"
8fee0c22 » gjherbiet
2010-10-04 Added -k option to keep (feature|hotfix|relase) branch when calling '…
319 fi
00ccea60 » hollow
2010-01-26 refactor the whole thing
320
ddba2df9 »
2010-02-19 Fix spacing issues.
321 if flag push; then
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
322 git_do push "$ORIGIN" "$DEVELOP_BRANCH" || \
ddba2df9 »
2010-02-19 Fix spacing issues.
323 die "Could not push to $DEVELOP_BRANCH from $ORIGIN."
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
324 git_do push "$ORIGIN" "$MASTER_BRANCH" || \
ddba2df9 »
2010-02-19 Fix spacing issues.
325 die "Could not push to $MASTER_BRANCH from $ORIGIN."
ca8be527 »
2010-10-05 Allow finishing release branches without creating a tag.
326 if noflag notag; then
15aab264 » jeromebaum
2012-09-25 Use git_do where appropriate
327 git_do push --tags "$ORIGIN" || \
ca8be527 »
2010-10-05 Allow finishing release branches without creating a tag.
328 die "Could not push tags to $ORIGIN."
329 fi
ddba2df9 »
2010-02-19 Fix spacing issues.
330 fi
00ccea60 » hollow
2010-01-26 refactor the whole thing
331
332 echo
333 echo "Summary of actions:"
350e7159 » hollow
2010-01-26 make origin configurable
334 echo "- Latest objects have been fetched from '$ORIGIN'"
010252a8 »
2010-02-04 Added an optional <base> argument to all start subactions.
335 echo "- Hotfix branch has been merged into '$MASTER_BRANCH'"
ca8be527 »
2010-10-05 Allow finishing release branches without creating a tag.
336 if noflag notag; then
337 echo "- The hotfix was tagged '$VERSION_PREFIX$VERSION'"
338 fi
010252a8 »
2010-02-04 Added an optional <base> argument to all start subactions.
339 echo "- Hotfix branch has been back-merged into '$DEVELOP_BRANCH'"
8fee0c22 » gjherbiet
2010-10-04 Added -k option to keep (feature|hotfix|relase) branch when calling '…
340 if flag keep; then
ddd9dfe9 »
2010-10-05 Tidy up a bit.
341 echo "- Hotfix branch '$BRANCH' is still available"
8fee0c22 » gjherbiet
2010-10-04 Added -k option to keep (feature|hotfix|relase) branch when calling '…
342 else
343 echo "- Hotfix branch '$BRANCH' has been deleted"
344 fi
ddba2df9 »
2010-02-19 Fix spacing issues.
345 if flag push; then
346 echo "- '$DEVELOP_BRANCH', '$MASTER_BRANCH' and tags have been pushed to '$ORIGIN'"
347 fi
00ccea60 » hollow
2010-01-26 refactor the whole thing
348 echo
349 }
Something went wrong with that request. Please try again.