Fix: stop using empty pathspecs

MeltwaterArchive · Jan 31, 2018 · ddf9ee1 · ddf9ee1
1 parent c4576c2
commit ddf9ee1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/hubflow-common b/hubflow-common
@@ -250,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"