From 38547ced7a83d87c4cb0acc2234dd4ad2f61cac9 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 11 Mar 2017 16:55:37 +0100
Subject: [PATCH] Can only diff once upstream branch is tracked

---
 advanced/Scripts/piholeCheckout.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/advanced/Scripts/piholeCheckout.sh b/advanced/Scripts/piholeCheckout.sh
index a3398daa..25874744 100644
--- a/advanced/Scripts/piholeCheckout.sh
+++ b/advanced/Scripts/piholeCheckout.sh
@@ -63,11 +63,15 @@ checkout_pull_branch() {
   local branch="${2}"
 
   cd "${directory}" || return 1
-  if [ "$(git diff "${branch}" | grep -c "^")" -gt "0" ]; then
+
+  local oldbranch="$(git symbolic-ref HEAD)"
+
+  git checkout "${branch}" || return 1
+
+  if [ "$(git diff "${oldbranch}" | grep -c "^")" -gt "0" ]; then
     update=true
   fi
 
-  git checkout "${branch}" || return 1
   git pull || return 1
   return 0
 }