From 82f5bd7c9c9118f2e5b623860beee1c76e03cec0 Mon Sep 17 00:00:00 2001 From: Michael Allen Date: Mon, 9 Mar 2015 11:48:49 +0000 Subject: prevent bad grep usage when no branch_name --- git-base.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'git-base.sh') diff --git a/git-base.sh b/git-base.sh index 40f733b..2debafa 100755 --- a/git-base.sh +++ b/git-base.sh @@ -123,12 +123,14 @@ readable_branch_name() { remote_branch_name() { local localRef="$(branch_name)" - local remoteBranch="$(git for-each-ref --format='%(upstream:short)' refs/heads $localRef 2>/dev/null | grep $localRef)" - if [[ -n $remoteBranch ]]; then - echo $remoteBranch - return 0 - else - return 1 + if [[ -n "$localRef" ]]; then + local remoteBranch="$(git for-each-ref --format='%(upstream:short)' refs/heads $localRef 2>/dev/null | grep $localRef)" + if [[ -n $remoteBranch ]]; then + echo $remoteBranch + return 0 + else + return 1 + fi fi } -- cgit v1.2.3