From 0a0d25dff49dcb1815e8b1868d57a9210caa469f Mon Sep 17 00:00:00 2001
From: Dan Schaper <dan.schaper@pi-hole.net>
Date: Fri, 10 Mar 2017 10:57:46 -0800
Subject: [PATCH] Script runs in subshell, no need to cd back to pwd.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
---
 advanced/Scripts/piholeCheckout.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/advanced/Scripts/piholeCheckout.sh b/advanced/Scripts/piholeCheckout.sh
index 86ea9a2b..0da8dd02 100644
--- a/advanced/Scripts/piholeCheckout.sh
+++ b/advanced/Scripts/piholeCheckout.sh
@@ -33,13 +33,10 @@ fully_fetch_repo() {
 get_available_branches(){
   # Return available branches
   local directory="${1}"
-  local curdir
 
-  curdir="${PWD}"
   cd "${directory}" || return 1
   # Get reachable remote branches
   git remote show origin | grep 'tracked' | sed 's/tracked//;s/ //g'
-  cd "${curdir}" || return 1
   return
 }
 
@@ -47,14 +44,11 @@ checkout_pull_branch() {
   # Check out specified branch
   local directory="${1}"
   local branch="${2}"
-  local curdir
 
-  curdir="${PWD}"
   cd "${directory}" || return 1
-  git checkout "${branch}"
-  git pull
-  cd "${curdir}" || return 1
-  return
+  git checkout "${branch}" || return 1
+  git pull || return 1
+  return 0
 }
 
 warning1() {