From 5997057f7abb6ced9891f5288f0e08d4b1b73a2f Mon Sep 17 00:00:00 2001
From: Seth Mason <seth@sethmason.com>
Date: Thu, 1 Oct 2015 23:46:46 -0700
Subject: Fix #2 branches with same name in multiple remotes

Use `git config` to get the correct upstream remote and branch when you
have branch with the same name in multiple remotes (e.g. "origin/master"
and "coworker/master"). Uses awk which may be a problem?
---
 radar-base.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index 258e5b1..6a9c630 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -199,10 +199,15 @@ branch_ref() {
 remote_branch_name() {
   local localRef="\/$(branch_name)$"
   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
-      printf '%s' $remoteBranch
-      return 0
+    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
     else
       return 1
     fi
-- 
cgit v1.2.3