From 1e5777926688395cae8ca690fe288e5fb900b951 Mon Sep 17 00:00:00 2001 From: gpongelli Date: Fri, 7 Jul 2017 09:55:25 +0200 Subject: [PATCH] Speed up "list" command execution, moving time consuming operation where they are really needed. --- git-flow-bugfix | 6 +++--- git-flow-feature | 6 +++--- git-flow-hotfix | 6 +++--- git-flow-release | 6 +++--- git-flow-support | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/git-flow-bugfix b/git-flow-bugfix index 720e86dc..aa80044e 100644 --- a/git-flow-bugfix +++ b/git-flow-bugfix @@ -109,15 +109,15 @@ v,verbose Verbose (more) output width=$(($width+3-${#PREFIX})) for branch in $bugfix_branches; do - base=$(git merge-base "$branch" "$DEVELOP_BRANCH") - develop_sha=$(git rev-parse "$DEVELOP_BRANCH") - branch_sha=$(git rev-parse "$branch") if [ "$branch" = "$current_branch" ]; then printf "* " else printf " " fi if flag verbose; then + base=$(git merge-base "$branch" "$DEVELOP_BRANCH") + develop_sha=$(git rev-parse "$DEVELOP_BRANCH") + branch_sha=$(git rev-parse "$branch") printf "%-${width}s" "${branch#$PREFIX}" if [ "$branch_sha" = "$develop_sha" ]; then printf "(no commits yet)" diff --git a/git-flow-feature b/git-flow-feature index 275f54bd..07730b54 100644 --- a/git-flow-feature +++ b/git-flow-feature @@ -109,15 +109,15 @@ v,verbose Verbose (more) output width=$(($width+3-${#PREFIX})) for branch in $feature_branches; do - base=$(git merge-base "$branch" "$DEVELOP_BRANCH") - develop_sha=$(git rev-parse "$DEVELOP_BRANCH") - branch_sha=$(git rev-parse "$branch") if [ "$branch" = "$current_branch" ]; then printf "* " else printf " " fi if flag verbose; then + base=$(git merge-base "$branch" "$DEVELOP_BRANCH") + develop_sha=$(git rev-parse "$DEVELOP_BRANCH") + branch_sha=$(git rev-parse "$branch") printf "%-${width}s" "${branch#$PREFIX}" if [ "$branch_sha" = "$develop_sha" ]; then printf "(no commits yet)" diff --git a/git-flow-hotfix b/git-flow-hotfix index f97ed44a..da399eca 100644 --- a/git-flow-hotfix +++ b/git-flow-hotfix @@ -105,15 +105,15 @@ v,verbose! Verbose (more) output width=$(($width+3-${#PREFIX})) for branch in $hotfix_branches; do - base=$(git merge-base "$branch" "$MASTER_BRANCH") - master_sha=$(git rev-parse "$MASTER_BRANCH") - branch_sha=$(git rev-parse "$branch") if [ "$branch" = "$current_branch" ]; then printf "* " else printf " " fi if flag verbose; then + base=$(git merge-base "$branch" "$MASTER_BRANCH") + master_sha=$(git rev-parse "$MASTER_BRANCH") + branch_sha=$(git rev-parse "$branch") printf "%-${width}s" "${branch#$PREFIX}" if [ "$branch_sha" = "$master_sha" ]; then printf "(no commits yet)" diff --git a/git-flow-release b/git-flow-release index e9c542da..283e691c 100644 --- a/git-flow-release +++ b/git-flow-release @@ -477,15 +477,15 @@ v,verbose! verbose (more) output width=$(($width+3-${#PREFIX})) for branch in $release_branches; do - base=$(git merge-base "$branch" "$DEVELOP_BRANCH") - develop_sha=$(git rev-parse "$DEVELOP_BRANCH") - branch_sha=$(git rev-parse "$branch") if [ "$branch" = "$current_branch" ]; then printf "* " else printf " " fi if flag verbose; then + base=$(git merge-base "$branch" "$DEVELOP_BRANCH") + develop_sha=$(git rev-parse "$DEVELOP_BRANCH") + branch_sha=$(git rev-parse "$branch") printf "%-${width}s" "${branch#$PREFIX}" if [ "$branch_sha" = "$develop_sha" ]; then printf "(no commits yet)" diff --git a/git-flow-support b/git-flow-support index 7957c196..8eb77802 100644 --- a/git-flow-support +++ b/git-flow-support @@ -103,15 +103,15 @@ v,verbose Verbose (more) output width=$(($width+3-${#PREFIX})) for branch in $support_branches; do - base=$(git merge-base "$branch" "$MASTER_BRANCH") - master_sha=$(git rev-parse "$MASTER_BRANCH") - branch_sha=$(git rev-parse "$branch") if [ "$branch" = "$current_branch" ]; then printf "* " else printf " " fi if flag verbose; then + base=$(git merge-base "$branch" "$MASTER_BRANCH") + master_sha=$(git rev-parse "$MASTER_BRANCH") + branch_sha=$(git rev-parse "$branch") printf "%-${width}s" "${branch#$PREFIX}" if [ "$branch_sha" = "$master_sha" ]; then printf "(no commits yet)"