File tree Expand file tree Collapse file tree 5 files changed +15
-15
lines changed
Expand file tree Collapse file tree 5 files changed +15
-15
lines changed Original file line number Diff line number Diff line change @@ -109,15 +109,15 @@ v,verbose Verbose (more) output
109109 width=$(( $width + 3 - ${# PREFIX} ))
110110
111111 for branch in $bugfix_branches ; do
112- base=$( git merge-base " $branch " " $DEVELOP_BRANCH " )
113- develop_sha=$( git rev-parse " $DEVELOP_BRANCH " )
114- branch_sha=$( git rev-parse " $branch " )
115112 if [ " $branch " = " $current_branch " ]; then
116113 printf " * "
117114 else
118115 printf " "
119116 fi
120117 if flag verbose; then
118+ base=$( git merge-base " $branch " " $DEVELOP_BRANCH " )
119+ develop_sha=$( git rev-parse " $DEVELOP_BRANCH " )
120+ branch_sha=$( git rev-parse " $branch " )
121121 printf " %-${width} s" " ${branch# $PREFIX } "
122122 if [ " $branch_sha " = " $develop_sha " ]; then
123123 printf " (no commits yet)"
Original file line number Diff line number Diff line change @@ -109,15 +109,15 @@ v,verbose Verbose (more) output
109109 width=$(( $width + 3 - ${# PREFIX} ))
110110
111111 for branch in $feature_branches ; do
112- base=$( git merge-base " $branch " " $DEVELOP_BRANCH " )
113- develop_sha=$( git rev-parse " $DEVELOP_BRANCH " )
114- branch_sha=$( git rev-parse " $branch " )
115112 if [ " $branch " = " $current_branch " ]; then
116113 printf " * "
117114 else
118115 printf " "
119116 fi
120117 if flag verbose; then
118+ base=$( git merge-base " $branch " " $DEVELOP_BRANCH " )
119+ develop_sha=$( git rev-parse " $DEVELOP_BRANCH " )
120+ branch_sha=$( git rev-parse " $branch " )
121121 printf " %-${width} s" " ${branch# $PREFIX } "
122122 if [ " $branch_sha " = " $develop_sha " ]; then
123123 printf " (no commits yet)"
Original file line number Diff line number Diff line change @@ -105,15 +105,15 @@ v,verbose! Verbose (more) output
105105 width=$(( $width + 3 - ${# PREFIX} ))
106106
107107 for branch in $hotfix_branches ; do
108- base=$( git merge-base " $branch " " $MASTER_BRANCH " )
109- master_sha=$( git rev-parse " $MASTER_BRANCH " )
110- branch_sha=$( git rev-parse " $branch " )
111108 if [ " $branch " = " $current_branch " ]; then
112109 printf " * "
113110 else
114111 printf " "
115112 fi
116113 if flag verbose; then
114+ base=$( git merge-base " $branch " " $MASTER_BRANCH " )
115+ master_sha=$( git rev-parse " $MASTER_BRANCH " )
116+ branch_sha=$( git rev-parse " $branch " )
117117 printf " %-${width} s" " ${branch# $PREFIX } "
118118 if [ " $branch_sha " = " $master_sha " ]; then
119119 printf " (no commits yet)"
Original file line number Diff line number Diff line change @@ -494,15 +494,15 @@ v,verbose! verbose (more) output
494494 width=$(( $width + 3 - ${# PREFIX} ))
495495
496496 for branch in $release_branches ; do
497- base=$( git merge-base " $branch " " $DEVELOP_BRANCH " )
498- develop_sha=$( git rev-parse " $DEVELOP_BRANCH " )
499- branch_sha=$( git rev-parse " $branch " )
500497 if [ " $branch " = " $current_branch " ]; then
501498 printf " * "
502499 else
503500 printf " "
504501 fi
505502 if flag verbose; then
503+ base=$( git merge-base " $branch " " $DEVELOP_BRANCH " )
504+ develop_sha=$( git rev-parse " $DEVELOP_BRANCH " )
505+ branch_sha=$( git rev-parse " $branch " )
506506 printf " %-${width} s" " ${branch# $PREFIX } "
507507 if [ " $branch_sha " = " $develop_sha " ]; then
508508 printf " (no commits yet)"
Original file line number Diff line number Diff line change @@ -103,15 +103,15 @@ v,verbose Verbose (more) output
103103 width=$(( $width + 3 - ${# PREFIX} ))
104104
105105 for branch in $support_branches ; do
106- base=$( git merge-base " $branch " " $MASTER_BRANCH " )
107- master_sha=$( git rev-parse " $MASTER_BRANCH " )
108- branch_sha=$( git rev-parse " $branch " )
109106 if [ " $branch " = " $current_branch " ]; then
110107 printf " * "
111108 else
112109 printf " "
113110 fi
114111 if flag verbose; then
112+ base=$( git merge-base " $branch " " $MASTER_BRANCH " )
113+ master_sha=$( git rev-parse " $MASTER_BRANCH " )
114+ branch_sha=$( git rev-parse " $branch " )
115115 printf " %-${width} s" " ${branch# $PREFIX } "
116116 if [ " $branch_sha " = " $master_sha " ]; then
117117 printf " (no commits yet)"
You can’t perform that action at this time.
0 commit comments