From 071b14b85dea774ec6db41239e8c1e3bbb97d5ca Mon Sep 17 00:00:00 2001 From: Gaetan Semet Date: Fri, 14 Feb 2014 13:52:14 +0100 Subject: [PATCH] don't use aliases in function Signed-off-by: Gaetan Semet --- custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh b/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh index c4f58c282..c4ae8b18f 100644 --- a/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh +++ b/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh @@ -84,7 +84,7 @@ function bb_merge_bottom_branch_to_here() local branch local bottom_branch - branch=$(git branches | grep "remotes/m/" | cut -d'/' -f5 | cut -d' ' -f1) + branch=$(git branch -a| grep "remotes/m/" | cut -d'/' -f5 | cut -d' ' -f1) case $branch in main) bottom_branch="staging" @@ -107,7 +107,7 @@ function bb_push_with_care() local branch local project - branch=$(git branches | grep "remotes/m/" | cut -d'/' -f5 | cut -d' ' -f1) + branch=$(git branch -a | grep "remotes/m/" | cut -d'/' -f5 | cut -d' ' -f1) project=$(git remote -v | grep umg | tail -n 1 | cut -d'/' -f6 | cut -d' ' -f1) if [[ -z $project || -z $branch ]]; then