[Bug releng/31616] Fix git_pretty_rev error,git_build checks in git_version.sh

[thaines.astro at gmail dot com]

https://sourceware.org/bugzilla/show_bug.cgi?id=31616

Tim Haines <thaines.astro at gmail dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|Fix git_pretty_rev error    |Fix git_pretty_rev
                   |check in git_version.sh     |error,git_build checks in
                   |                            |git_version.sh

--- Comment #2 from Tim Haines <thaines.astro at gmail dot com> ---
Sorry, I meant to include a wider context in the diff. I also just noticed that
the check for 'git_build' just before this one has the same error. I've
included that here, as well. 

diff --git a/git_version.sh b/git_version.sh
index e916a37d9..bc286ded6 100755
--- a/git_version.sh
+++ b/git_version.sh
@@ -207,26 +207,26 @@ if [ "x$git_repo_dir" != "x" ]; then #
         if [ "x$($GIT diff-files)" = "x" ] && [ "x$($GIT diff-index --cached
HEAD)" = "x" ]; then
             git_dirty=no
         fi
         # Grab the origin url, stripping out any credentials that might be in
it
         git_remote_url=`$GIT config --get remote.origin.url | $SED -nE
's/^(.*:\/\/)(.*\@)?(.*)$/\3/p'`
         if [ "x$git_remote_url" = "x" ]; then
             git_remote_url="(no remote)"
         fi
         # Grab the linear git revision number
         git_build=`$GIT log --oneline | wc -l | $SED 's/^[ \t]*//'`
-        if [ "x$git_shaid" = "x" ]; then
+        if [ "x$git_build" = "x" ]; then
             git_errors="${git_errors+${git_errors}; }error running '$GIT log
--oneline'"
         fi
         # Grab the "pretty" revision number
         git_pretty_rev=`$GIT describe --dirty --always --abbrev=8`
-        if [ "x$git_shaid" = "x" ]; then
+        if [ "x$git_pretty_rev" = "x" ]; then
             git_errors="${git_errors+${git_errors}; }error running '$GIT
describe'"
         fi
         # Grab the commit timestamp
         git_timestamp=`$GIT show -s --format=%ct | tail -1`
         if [ "x$git_timestamp" = "x" ]; then
             git_errors="${git_errors+${git_errors}; }error running '$GIT show
-s --format=%ct'"
         fi
     fi
 fi

-- 
You are receiving this mail because:
You are the assignee for the bug.