From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 9 Nov 2017 23:02:49 +0000 (-0500)
Subject: added coolness checking branch name
X-Git-Tag: 2.140.90~6^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=b31d761ac5ed987a929b3211fc0fad17482338f4;hp=b03319af05644dda3a7c91f25048770bcc6f6a14;p=feisty_meow.git

added coolness checking branch name

checks the branch name now so it will not do the pull origin master unless it actually needs to.
---

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index b19f9a42..be183ae1 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -209,6 +209,13 @@ function squash_first_few_crs()
   fi
 }
 
+# a helpful method that reports the git branch for the current directory's
+# git repository.
+function git_branch_name()
+{
+  echo "$(git branch | grep \* | cut -d ' ' -f2-)"
+}
+
 # gets the latest versions of the assets from the upstream repository.
 function do_update()
 {
@@ -240,8 +247,13 @@ function do_update()
   elif [ -d ".git" ]; then
     if test_writeable ".git"; then
       $blatt
-      git pull origin master 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
-      retval=${PIPESTATUS[0]}
+      retval=0
+
+      if [ "$(git_branch_name)" != "master" ]; then
+        git pull origin master 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+        retval+=${PIPESTATUS[0]}
+      fi
+
       git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
       retval+=${PIPESTATUS[0]}
     fi