Skip to content

Pulling in master from fork. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DarinMacRae merged 4 commits into from
Mar 7, 2018
Merged

Pulling in master from fork. #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bdc30d
tmp
stuartherbert Jan 31, 2018
c4576c2
Version bump for hotfix release
stuartherbert Jan 31, 2018
ddf9ee1
Fix: stop using empty pathspecs
stuartherbert Jan 31, 2018
ed03243
Merge branch 'hotfix/1.5.3'
stuartherbert Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions hubflow-common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
# Common variables
#

HUBFLOW_VERSION=1.5.2
HUBFLOW_VERSION=1.5.3
HUBFLOW_REPO=https://github.com/datasift/gitflow

#
Expand Down Expand Up @@ -220,6 +220,11 @@ hubflow_change_branch() {
}

hubflow_branch_push() {
# make sure we have something to push onto the stack
if [[ -z $1 ]] ; then
die "*** internal error: attempt to push empty item onto the stack"
fi

# make sure we have a stack to push onto
if [[ -z BRANCH_STACK ]] ; then
BRANCH_STACK=()
Expand All @@ -245,10 +250,11 @@ hubflow_branch_pop() {
# make sure the stack is not empty
[[ $BRANCH_STACK_SP != 0 ]] || die "Internal error: attempt to pop from empty BRANCH_STACK"

# pop the branch from the stack
local popped_branch=${BRANCH_STACK[$BRANCH_STACK_SP]}
BRANCH_STACK[$BRANCH_STACK_SP]=
let "BRANCH_STACK_SP -= 1"
# pop the branch from the stack
local tmp_branch_sp=$BRANCH_STACK_SP
let "BRANCH_STACK_SP -= 1"
local popped_branch=${BRANCH_STACK[$BRANCH_STACK_SP]}
unset BRANCH_STACK[$tmp_branch_sp]

# do we need to switch branch too?
hubflow_change_branch "$popped_branch"
Expand Down