From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <sourceware-bugzilla@sourceware.org>
Received: by sourceware.org (Postfix, from userid 48)
	id 71B0F3858C60; Sat,  6 Apr 2024 18:12:30 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 71B0F3858C60
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
	s=default; t=1712427150;
	bh=eocjyZW2ph3e0YQsNlVQC2MjXjSpg7DFla5K2gFxMuo=;
	h=From:To:Subject:Date:In-Reply-To:References:From;
	b=x7MIEDuaQ849tvZw9QlnD0tp2Sf/d2WqI6vRxd0nXkr8tDM0YlfkKAY1Z8VAtAxY7
	 3AHFrXycnKl/YsuLOs7qWCLXMRTqaTIry5EHwTdxOTsG0RxqwcRnOmz9AAwkJ6Dmga
	 WIZE4lZKFWvwVVkuSo9zlpekaGZVKcgOhGpSJQM4=
From: "thaines.astro at gmail dot com" <sourceware-bugzilla@sourceware.org>
To: systemtap@sourceware.org
Subject: [Bug releng/31616] Fix git_pretty_rev error,git_build checks in
 git_version.sh
Date: Sat, 06 Apr 2024 18:12:30 +0000
X-Bugzilla-Reason: AssignedTo
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: systemtap
X-Bugzilla-Component: releng
X-Bugzilla-Version: unspecified
X-Bugzilla-Keywords: 
X-Bugzilla-Severity: normal
X-Bugzilla-Who: thaines.astro at gmail dot com
X-Bugzilla-Status: UNCONFIRMED
X-Bugzilla-Resolution: 
X-Bugzilla-Priority: P2
X-Bugzilla-Assigned-To: systemtap at sourceware dot org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: short_desc
Message-ID: <bug-31616-6586-0xzuh77QYf@http.sourceware.org/bugzilla/>
In-Reply-To: <bug-31616-6586@http.sourceware.org/bugzilla/>
References: <bug-31616-6586@http.sourceware.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: http://sourceware.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
List-Id: <systemtap.sourceware.org>

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

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.=20

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" !=3D "x" ]; then #
         if [ "x$($GIT diff-files)" =3D "x" ] && [ "x$($GIT diff-index --ca=
ched
HEAD)" =3D "x" ]; then
             git_dirty=3Dno
         fi
         # Grab the origin url, stripping out any credentials that might be=
 in
it
         git_remote_url=3D`$GIT config --get remote.origin.url | $SED -nE
's/^(.*:\/\/)(.*\@)?(.*)$/\3/p'`
         if [ "x$git_remote_url" =3D "x" ]; then
             git_remote_url=3D"(no remote)"
         fi
         # Grab the linear git revision number
         git_build=3D`$GIT log --oneline | wc -l | $SED 's/^[ \t]*//'`
-        if [ "x$git_shaid" =3D "x" ]; then
+        if [ "x$git_build" =3D "x" ]; then
             git_errors=3D"${git_errors+${git_errors}; }error running '$GIT=
 log
--oneline'"
         fi
         # Grab the "pretty" revision number
         git_pretty_rev=3D`$GIT describe --dirty --always --abbrev=3D8`
-        if [ "x$git_shaid" =3D "x" ]; then
+        if [ "x$git_pretty_rev" =3D "x" ]; then
             git_errors=3D"${git_errors+${git_errors}; }error running '$GIT
describe'"
         fi
         # Grab the commit timestamp
         git_timestamp=3D`$GIT show -s --format=3D%ct | tail -1`
         if [ "x$git_timestamp" =3D "x" ]; then
             git_errors=3D"${git_errors+${git_errors}; }error running '$GIT=
 show
-s --format=3D%ct'"
         fi
     fi
 fi

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