From a0beb92f7f28fadb8255ee05765497eeb159795b Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Fri, 16 Oct 2015 11:43:00 +0100
Subject: That if statement wasn't doing what I thought it was

---
 radar-base.sh | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index 52043d4..9527343 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -198,19 +198,17 @@ branch_ref() {
 
 remote_branch_name() {
   local localRef="$(branch_name)"
-  if [[ -n "$localRef" ]]; then
-    local remote="$(git config --get-regexp "^branch\.$localRef\.remote" | awk '{print $2}')"
-    if [[ -n $remote ]]; then
-      local remoteBranch="$(git config --get-regexp "^branch\.${localRef}\.merge" | awk -F'/' '{print $NF}')"
-      if [[ -n $remoteBranch ]]; then
-        printf '%s/%s' $remote $remoteBranch
-        return 0
-      else
-          return 1
-      fi
+  local remote="$(git config --get-regexp "^branch\.$localRef\.remote" | awk '{print $2}')"
+  if [[ -n $remote ]]; then
+    local remoteBranch="$(git config --get-regexp "^branch\.${localRef}\.merge" | awk -F'/' '{print $NF}')"
+    if [[ -n $remoteBranch ]]; then
+      printf '%s/%s' $remote $remoteBranch
+      return 0
     else
-      return 1
+        return 1
     fi
+  else
+    return 1
   fi
 }
 
-- 
cgit v1.2.3