File tree Expand file tree Collapse file tree 3 files changed +42
-1
lines changed Expand file tree Collapse file tree 3 files changed +42
-1
lines changed Original file line number Diff line number Diff line change 11# Changelog
22
3+ #### 2.2.0-SNAPSHOT
4+ * feat(feature): add release sub command. Thank You [ codesurf42] ( https://github.com/codesurf42 ) for the initial pr
5+ * feat(init): add sign flag to create initial signed commit
6+ * feat(init): add support for "Support Git Environment Credentials" pull request #19 from filipekiss/feature/environment_credentials
7+ * docs: update repository url in source files
8+ * docs: update copyright information in source files
9+ * fix: wording for help text in git flow log pull request #15 from Shea690901/hotfix/git-flow-log_help-message
10+ * refactor(git-flow): add support for busybox-readlink request #12 from KAction/readlink-busybox
11+
12+
313#### 2.1.0
414* feat: add create command to release allowing for a single step release prodution
515* feat: add missing hook script filter-flow-release-finish-version
Original file line number Diff line number Diff line change @@ -59,6 +59,7 @@ git flow feature checkout
5959git flow feature pull
6060git flow feature delete
6161git flow feature rename
62+ git flow feature release
6263
6364Manage your feature branches.
6465
@@ -430,6 +431,36 @@ no-ff! Never fast-forward during the merge
430431 helper_finish_cleanup
431432}
432433
434+ cmd_release () {
435+ OPTIONS_SPEC=" \
436+ git flow feature release [-h]
437+
438+ Create a release based on current feature
439+ --
440+ h,help! Show this help
441+ "
442+
443+ # 1) pull dev from origin
444+ # git_do checkout "$BRANCH"
445+ # git_do (or somth exists alredy here?)
446+
447+ # Parse arguments
448+ parse_args " $@ "
449+
450+ # Use current branch if no name is given
451+ if [ " $NAME " = " " ]; then
452+ gitflow_use_current_branch_name
453+ fi
454+
455+ # 2) Update feature with dev
456+ echo " Rebasing $BASE_BRANCH to $BRANCH "
457+ git_do flow feature rebase || die " Could not rebase $BRANCH which is based on $BASE_BRANCH "
458+
459+ # 3) create release
460+ git_do flow release start $NAME $BRANCH
461+
462+ }
463+
433464helper_finish_cleanup () {
434465 local keepmsg remotebranchdeleted localbranchdeleted
435466
Original file line number Diff line number Diff line change 3939#
4040
4141
42- GITFLOW_VERSION=2.1.0
42+ GITFLOW_VERSION=2.2.0-SNAPSHOT-2
4343
4444initialize () {
4545 # A function can not be empty. Comments count as empty.
You can’t perform that action at this time.
0 commit comments