From 989911c595b19aac9ecb4aa87eb2ac4d57610c86 Mon Sep 17 00:00:00 2001
From: Claudio Bandera <claudio.bandera@kit.edu>
Date: Fri, 28 Aug 2015 10:35:47 +0200
Subject: Added git stash indicator

---
 radar-base.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index b7074d8..aa8ed2f 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -469,3 +469,17 @@ zsh_color_remote_commits() {
 
   printf %s "$remote"
 }
+
+bash_stash_status() {
+  local number_stashes="$(git stash list | wc -l)"
+  if [ $number_stashes -gt 0 ]; then
+    printf " $number_stashes\x01\033[1;33m\x02␣\x01\033[0m\x02)"
+  fi
+}
+
+zsh_stash_status() {
+  local number_stashes="$(git stash list | wc -l)"
+  if [ $number_stashes -gt 0 ]; then
+    printf %s " $number_stashes%{$fg_bold[yellow]%}␣%{$reset_color%})"
+  fi
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 2cfe557beb7fec2e67ea8cd0096eeff0be14b00f Mon Sep 17 00:00:00 2001
From: Claudio Bandera <claudio.bandera@kit.edu>
Date: Fri, 28 Aug 2015 10:54:17 +0200
Subject: Changed symbol for stash

---
 radar-base.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index aa8ed2f..1be76e4 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -473,13 +473,13 @@ zsh_color_remote_commits() {
 bash_stash_status() {
   local number_stashes="$(git stash list | wc -l)"
   if [ $number_stashes -gt 0 ]; then
-    printf " $number_stashes\x01\033[1;33m\x02␣\x01\033[0m\x02)"
+    printf " $number_stashes\x01\033[1;33m\x02=\x01\033[0m\x02)"
   fi
 }
 
 zsh_stash_status() {
   local number_stashes="$(git stash list | wc -l)"
   if [ $number_stashes -gt 0 ]; then
-    printf %s " $number_stashes%{$fg_bold[yellow]%}␣%{$reset_color%})"
+    printf %s " $number_stashes%{$fg_bold[yellow]%}=%{$reset_color%})"
   fi
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 4a7d636bad0d03af22f440bef9bd141bfc0dc309 Mon Sep 17 00:00:00 2001
From: Claudio Bandera <claudio.bandera@kit.edu>
Date: Mon, 31 Aug 2015 00:07:46 +0200
Subject: Added tests for stash indicator

---
 radar-base.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index 1be76e4..ec907b0 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -470,16 +470,20 @@ zsh_color_remote_commits() {
   printf %s "$remote"
 }
 
+stashed_status() {
+  printf '%s' "$(git stash list | wc -l 2>/dev/null)"
+}
+
 bash_stash_status() {
-  local number_stashes="$(git stash list | wc -l)"
+  local number_stashes="$(stashed_status)"
   if [ $number_stashes -gt 0 ]; then
-    printf " $number_stashes\x01\033[1;33m\x02=\x01\033[0m\x02)"
+    printf " $number_stashes\x01\033[1;33m\x02=\x01\033[0m\x02"
   fi
 }
 
 zsh_stash_status() {
-  local number_stashes="$(git stash list | wc -l)"
+  local number_stashes="$(stashed_status)"
   if [ $number_stashes -gt 0 ]; then
-    printf %s " $number_stashes%{$fg_bold[yellow]%}=%{$reset_color%})"
+    printf %s " $number_stashes%{$fg_bold[yellow]%}=%{$reset_color%}"
   fi
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 5adc604fc1b0c11af8a85928e2a7d756fc5ad776 Mon Sep 17 00:00:00 2001
From: Claudio Bandera <claudio.bandera@kit.edu>
Date: Thu, 17 Sep 2015 18:27:25 +0200
Subject: Adapted new color and naming model.

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

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index 58a28c1..b8ab1f2 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -28,6 +28,8 @@ prepare_bash_colors() {
   COLOR_CHANGES_CONFLICTED="\x01${GIT_RADAR_COLOR_CHANGES_CONFLICTED:-"\\033[1;33m"}\x02"
   COLOR_CHANGES_UNTRACKED="\x01${GIT_RADAR_COLOR_CHANGES_UNTRACKED:-"\\033[1;37m"}\x02"
 
+  COLOR_STASH="\x01${GIT_RADAR_COLOR_STASH:-"\\033[1;33m"}\x02"
+
   COLOR_BRANCH="\x01${GIT_RADAR_COLOR_BRANCH:-"\\033[0m"}\x02"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"\\x01\\033[0m\\x02\\xF0\\x9D\\x98\\xAE\\x01\\033[0m\\x02"}"
 
@@ -35,6 +37,8 @@ prepare_bash_colors() {
   RESET_COLOR_REMOTE="\x01${GIT_RADAR_COLOR_REMOTE_RESET:-"\\033[0m"}\x02"
   RESET_COLOR_CHANGES="\x01${GIT_RADAR_COLOR_CHANGES_RESET:-"\\033[0m"}\x02"
   RESET_COLOR_BRANCH="\x01${GIT_RADAR_COLOR_BRANCH_RESET:-"\\033[0m"}\x02"
+  RESET_COLOR_STASH="\x01${GIT_RADAR_COLOR_STASH:-"\\033[0m"}\x02"
+  
 }
 
 prepare_zsh_colors() {
@@ -60,6 +64,8 @@ prepare_zsh_colors() {
   COLOR_CHANGES_CONFLICTED="%{${GIT_RADAR_COLOR_CHANGES_CONFLICTED:-$fg_bold[yellow]}%}"
   COLOR_CHANGES_UNTRACKED="%{${GIT_RADAR_COLOR_CHANGES_UNTRACKED:-$fg_bold[white]}%}"
 
+  COLOR_STASH="%{${GIT_RADAR_COLOR_STASH:-$fg_bold[yellow]}%}"
+  
   local italic_m="$(printf '\xF0\x9D\x98\xAE')"
 
   COLOR_BRANCH="%{${GIT_RADAR_COLOR_BRANCH:-$reset_color}%}"
@@ -69,6 +75,7 @@ prepare_zsh_colors() {
   RESET_COLOR_REMOTE="%{${GIT_RADAR_COLOR_REMOTE_RESET:-$reset_color}%}"
   RESET_COLOR_CHANGES="%{${GIT_RADAR_COLOR_CHANGES_RESET:-$reset_color}%}"
   RESET_COLOR_BRANCH="%{${GIT_RADAR_COLOR_BRANCH_RESET:-$reset_color}%}"
+  RESET_COLOR_STASH="%{${GIT_RADAR_COLOR_STASH:-$reset_color}%}"
 }
 
 in_current_dir() {
@@ -489,16 +496,9 @@ stashed_status() {
   printf '%s' "$(git stash list | wc -l 2>/dev/null)"
 }
 
-bash_stash_status() {
-  local number_stashes="$(stashed_status)"
-  if [ $number_stashes -gt 0 ]; then
-    printf " $number_stashes\x01\033[1;33m\x02=\x01\033[0m\x02"
-  fi
-}
-
-zsh_stash_status() {
+stash_status() {
   local number_stashes="$(stashed_status)"
   if [ $number_stashes -gt 0 ]; then
-    printf %s " $number_stashes%{$fg_bold[yellow]%}=%{$reset_color%}"
+    printf $PRINT_F_OPTION " $number_stashes$COLOR_STASH≡$RESET_COLOR_STASH"
   fi
 }
-- 
cgit v1.2.3


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


From f29d9440b856c884b3a3046ac1c696433c06f5ae Mon Sep 17 00:00:00 2001
From: Steven Hall <Hallzy.18@gmail.com>
Date: Thu, 15 Oct 2015 12:34:08 -0700
Subject: Provides a fix for Isssue #69.

---
 radar-base.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index 258e5b1..429fa8f 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -1,6 +1,7 @@
 NO_REMOTE_STATUS='--no-remote-status'
 
 dot_git=""
+stat_type=""
 cwd=""
 remote=""
 rcfile_path="$HOME"
@@ -119,6 +120,15 @@ dot_git() {
   fi
 }
 
+stat_type() {
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+    stat_type="gstat"
+  else
+    stat_type="stat"
+  fi
+  printf '%s' $stat_type
+}
+
 is_repo() {
   if [[ -n "$(dot_git)" ]]; then
     return 0
@@ -143,7 +153,7 @@ record_timestamp() {
 
 timestamp() {
   if is_repo; then
-    printf '%s' "$(stat -f%m "$(dot_git)/lastupdatetime" 2>/dev/null || printf '%s' "0")"
+    printf '%s' "$("$(stat_type)" -c%Z "$(dot_git)/lastupdatetime" 2>/dev/null || printf '%s' "0")"
   fi
 }
 
-- 
cgit v1.2.3


From 3aec9621ca391d8ea61df4daddb407a7acf1ecf6 Mon Sep 17 00:00:00 2001
From: Steven Hall <Hallzy.18@gmail.com>
Date: Thu, 15 Oct 2015 12:51:18 -0700
Subject: Removed unnecessary quotes.

---
 radar-base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index 429fa8f..02b1bb9 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -153,7 +153,7 @@ record_timestamp() {
 
 timestamp() {
   if is_repo; then
-    printf '%s' "$("$(stat_type)" -c%Z "$(dot_git)/lastupdatetime" 2>/dev/null || printf '%s' "0")"
+    printf '%s' "$($(stat_type) -c%Z "$(dot_git)/lastupdatetime" 2>/dev/null || printf '%s' "0")"
   fi
 }
 
-- 
cgit v1.2.3


From 1a856774a1c0d0f6a9957046e90c1c24d253e6a0 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Thu, 15 Oct 2015 17:42:57 +0100
Subject: Fix tests broken by old regex string

---
 radar-base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index 6a9c630..52043d4 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -197,7 +197,7 @@ branch_ref() {
 }
 
 remote_branch_name() {
-  local localRef="\/$(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
-- 
cgit v1.2.3


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


From 532d76036d5d5cd9161d90a735ed0edd1f9c869d Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Fri, 16 Oct 2015 13:08:05 +0100
Subject: %Z returns the modified date, %Y returns the changed date

The OSX version of stat uses %m to return the 'modified' date since
epoch. The GNU version of stat doesn't have the %m format code.

%Z which was being used in @hallzy's fix returns the 'changed' date
since epoch, which only changes when you modify the metadata on a file.
This meant that when we `touch $dot_git/.lastupdatetime` the 'changed'
date doesn't change.

I've switched to the %Y flag which returns the 'modified' time. This is
the time that is changed when `touch` modifies the file.
---
 radar-base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index 02b1bb9..7c27165 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -153,7 +153,7 @@ record_timestamp() {
 
 timestamp() {
   if is_repo; then
-    printf '%s' "$($(stat_type) -c%Z "$(dot_git)/lastupdatetime" 2>/dev/null || printf '%s' "0")"
+    printf '%s' "$($(stat_type) -c%Y "$(dot_git)/lastupdatetime" 2>/dev/null || printf '%s' "0")"
   fi
 }
 
-- 
cgit v1.2.3


From 51b15bb282dd3c4fc789e2de913ffd561c5debcd Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Fri, 16 Oct 2015 13:49:34 +0100
Subject: Hook new stash_status in to render_prompt

---
 radar-base.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index 26ea328..168acf6 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -509,7 +509,7 @@ stashed_status() {
 stash_status() {
   local number_stashes="$(stashed_status)"
   if [ $number_stashes -gt 0 ]; then
-    printf $PRINT_F_OPTION " $number_stashes$COLOR_STASH≡$RESET_COLOR_STASH"
+    printf $PRINT_F_OPTION "$number_stashes$COLOR_STASH≡$RESET_COLOR_STASH"
   fi
 }
 
@@ -519,6 +519,7 @@ render_prompt() {
   remote_sed=""
   local_sed=""
   changes_sed=""
+  stash_sed=""
 
 
   if_pre="%\{([^%{}]{1,}:){0,1}"
@@ -558,10 +559,19 @@ render_prompt() {
       changes_sed="s/${sed_pre}changes${sed_post}//"
     fi
   fi
+  if [[ $PROMPT_FORMAT =~ ${if_pre}stash${if_post} ]]; then
+    stash_result="$(stash_status)"
+    if [[ -n "$stash_result" ]]; then
+      stash_sed="s/${sed_pre}stash${sed_post}/\2${stash_result}\4/"
+    else
+      stash_sed="s/${sed_pre}stash${sed_post}//"
+    fi
+  fi
 
   printf '%b' "$output" | sed \
                             -e "$remote_sed" \
                             -e "$branch_sed" \
                             -e "$changes_sed" \
-                            -e "$local_sed"
+                            -e "$local_sed" \
+                            -e "$stash_sed"
 }
-- 
cgit v1.2.3


From 6b3360f2a00b55043d2dba574223c6ba77e76580 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Fri, 16 Oct 2015 13:51:15 +0100
Subject: Include stash indicator in default prompt

---
 radar-base.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index 168acf6..f3b0d49 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -41,7 +41,7 @@ prepare_bash_colors() {
   COLOR_BRANCH="\x01${GIT_RADAR_COLOR_BRANCH:-"\\033[0m"}\x02"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"\\x01\\033[0m\\x02\\xF0\\x9D\\x98\\xAE\\x01\\033[0m\\x02"}"
 
-  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" \\x01\\033[1;30m\\x02git:(\\x01\\033[0m\\x02%{remote: }%{branch}%{ :local}\\x01\\033[1;30m\\x02)\\x01\\033[0m\\x02%{ :changes}"}"
+  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" \\x01\\033[1;30m\\x02git:(\\x01\\033[0m\\x02%{remote: }%{branch}%{ :local}\\x01\\033[1;30m\\x02)\\x01\\033[0m\\x02%{ :stash}%{ :changes}"}"
 
   RESET_COLOR_LOCAL="\x01${GIT_RADAR_COLOR_LOCAL_RESET:-"\\033[0m"}\x02"
   RESET_COLOR_REMOTE="\x01${GIT_RADAR_COLOR_REMOTE_RESET:-"\\033[0m"}\x02"
@@ -81,7 +81,7 @@ prepare_zsh_colors() {
   COLOR_BRANCH="%{${GIT_RADAR_COLOR_BRANCH:-$reset_color}%}"
   MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"%{$reset_color%}$italic_m%{$reset_color%}"}"
 
-  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" %{$fg_bold[grey]%}git:(%{$reset_color%}%{remote: }%{branch}%{ :local}%{$fg_bold[grey]%})%{$reset_color%}%{ :changes}"}"
+  PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" %{$fg_bold[grey]%}git:(%{$reset_color%}%{remote: }%{branch}%{ :local}%{$fg_bold[grey]%})%{$reset_color%}%{ :stash}%{ :changes}"}"
 
   RESET_COLOR_LOCAL="%{${GIT_RADAR_COLOR_LOCAL_RESET:-$reset_color}%}"
   RESET_COLOR_REMOTE="%{${GIT_RADAR_COLOR_REMOTE_RESET:-$reset_color}%}"
-- 
cgit v1.2.3


From 5f5ea03dc57b8aca2a8f8ac938d044dcd110d57a Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Fri, 16 Oct 2015 13:52:54 +0100
Subject: Strip spaces from the stash number (which OSX wc adds for no reason)

---
 radar-base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index f3b0d49..c355f3c 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -503,7 +503,7 @@ show_remote_status() {
 }
 
 stashed_status() {
-  printf '%s' "$(git stash list | wc -l 2>/dev/null)"
+  printf '%s' "$(git stash list | wc -l 2>/dev/null | grep -oEi '[0-9][0-9]*')"
 }
 
 stash_status() {
-- 
cgit v1.2.3


From 5bee2b0f959cd44cd636610d06d67f103fdbe37b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Hunold?= <juergen.hunold@ivembh.de>
Date: Fri, 16 Oct 2015 09:52:50 +0200
Subject: Escape all forward slashes

With out the 'g' flag only the first one will be replaced.
This leads to errors with branches like wip/user/hotfix.
---
 radar-base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'radar-base.sh')

diff --git a/radar-base.sh b/radar-base.sh
index 258e5b1..aeb0f41 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -517,7 +517,7 @@ render_prompt() {
     fi
   fi
   if [[ $PROMPT_FORMAT =~ ${if_pre}branch${if_post} ]]; then
-    branch_result="$(readable_branch_name | sed -e 's/\//\\\//')"
+    branch_result="$(readable_branch_name | sed -e 's/\//\\\//g')"
     if [[ -n "$branch_result" ]]; then
       branch_sed="s/${sed_pre}branch${sed_post}/\2${branch_result}\4/"
     else
-- 
cgit v1.2.3


From ddb1e04e741bb6f1d8a159367c1bc123d387c87d Mon Sep 17 00:00:00 2001
From: Seth Mason <smason@edgecast.com>
Date: Fri, 16 Oct 2015 12:00:23 -0700
Subject: Remove a awk calls

Turns out it had a bug when the branch name had a slash in it.
---
 radar-base.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'radar-base.sh')

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