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 [thread overview]
Message-ID: <bug-31616-6586-0xzuh77QYf@http.sourceware.org/bugzilla/> (raw)
In-Reply-To: <bug-31616-6586@http.sourceware.org/bugzilla/>
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.
next prev parent reply other threads:[~2024-04-06 18:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-06 17:32 [Bug releng/31616] New: Fix git_pretty_rev error check " thaines.astro at gmail dot com
2024-04-06 17:56 ` [Bug releng/31616] " fche at redhat dot com
2024-04-06 18:12 ` thaines.astro at gmail dot com [this message]
2024-04-06 18:15 ` [Bug releng/31616] Fix git_pretty_rev error,git_build checks " thaines.astro at gmail dot com
2024-04-11 22:51 ` fche at redhat dot com
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bug-31616-6586-0xzuh77QYf@http.sourceware.org/bugzilla/ \
--to=sourceware-bugzilla@sourceware.org \
--cc=systemtap@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).