From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 25 Jun 2020 14:42:11 +0000 (-0400)
Subject: updated to work on centos
X-Git-Tag: 2.140.123^2~2
X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=38aacae3e1c6524cf3d6f9be2f107fdf4ab63cac

updated to work on centos

centos was bitching about:
  git rev-parse @
and
  git pull --tags --all
on centos 7.
revised to use:
  git rev-parse HEAD
and
  git fetch --tags --all
instead.
---

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 703e003d..80142d05 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -260,9 +260,9 @@ function check_branch_state()
 
   local to_return=120  # unknown issue.
 
-  local local_branch=$(git rev-parse @)
+  local local_branch=$(git rev-parse HEAD)
   local remote_branch=$(git rev-parse "$branch")
-  local merge_base=$(git merge-base @ "$branch")
+  local merge_base=$(git merge-base HEAD "$branch")
 
   local to_echo=
   if [ "$local_branch" == "$remote_branch" ]; then
@@ -357,7 +357,7 @@ function do_revctrl_careful_update()
 
   # now pull down any changes in our own origin in the repo, to stay in synch
   # with any changes from others.
-  git pull --tags --all | $TO_SPLITTER
+  git fetch --tags --all | $TO_SPLITTER
 #is the above really important when we did this branch already in the loop?
 #it does an --all, but is that effective or different?  should we be doing that in above loop?
   promote_pipe_return 0