* [Bug releng/31616] New: Fix git_pretty_rev error check in git_version.sh
@ 2024-04-06 17:32 thaines.astro at gmail dot com
2024-04-06 17:56 ` [Bug releng/31616] " fche at redhat dot com
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: thaines.astro at gmail dot com @ 2024-04-06 17:32 UTC (permalink / raw)
To: systemtap
https://sourceware.org/bugzilla/show_bug.cgi?id=31616
Bug ID: 31616
Summary: Fix git_pretty_rev error check in git_version.sh
Product: systemtap
Version: unspecified
Status: UNCONFIRMED
Severity: normal
Priority: P2
Component: releng
Assignee: systemtap at sourceware dot org
Reporter: thaines.astro at gmail dot com
Target Milestone: ---
diff --git a/git_version.sh b/git_version.sh
index e916a37d9..04caaccb9 100755
--- a/git_version.sh
+++ b/git_version.sh
@@ -219,7 +219,7 @@ if [ "x$git_repo_dir" != "x" ]; then #
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
--
You are receiving this mail because:
You are the assignee for the bug.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Bug releng/31616] Fix git_pretty_rev error check in git_version.sh
2024-04-06 17:32 [Bug releng/31616] New: Fix git_pretty_rev error check in git_version.sh thaines.astro at gmail dot com
@ 2024-04-06 17:56 ` fche at redhat dot com
2024-04-06 18:12 ` [Bug releng/31616] Fix git_pretty_rev error,git_build checks " thaines.astro at gmail dot com
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: fche at redhat dot com @ 2024-04-06 17:56 UTC (permalink / raw)
To: systemtap
https://sourceware.org/bugzilla/show_bug.cgi?id=31616
Frank Ch. Eigler <fche at redhat dot com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |fche at redhat dot com
--- Comment #1 from Frank Ch. Eigler <fche at redhat dot com> ---
Can you explain & provide a before/after output?
--
You are receiving this mail because:
You are the assignee for the bug.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Bug releng/31616] Fix git_pretty_rev error,git_build checks in git_version.sh
2024-04-06 17:32 [Bug releng/31616] New: Fix git_pretty_rev error check in git_version.sh 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
2024-04-06 18:15 ` thaines.astro at gmail dot com
2024-04-11 22:51 ` fche at redhat dot com
3 siblings, 0 replies; 5+ messages in thread
From: thaines.astro at gmail dot com @ 2024-04-06 18:12 UTC (permalink / raw)
To: systemtap
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Bug releng/31616] Fix git_pretty_rev error,git_build checks in git_version.sh
2024-04-06 17:32 [Bug releng/31616] New: Fix git_pretty_rev error check in git_version.sh thaines.astro at gmail dot com
2024-04-06 17:56 ` [Bug releng/31616] " fche at redhat dot com
2024-04-06 18:12 ` [Bug releng/31616] Fix git_pretty_rev error,git_build checks " thaines.astro at gmail dot com
@ 2024-04-06 18:15 ` thaines.astro at gmail dot com
2024-04-11 22:51 ` fche at redhat dot com
3 siblings, 0 replies; 5+ messages in thread
From: thaines.astro at gmail dot com @ 2024-04-06 18:15 UTC (permalink / raw)
To: systemtap
https://sourceware.org/bugzilla/show_bug.cgi?id=31616
--- Comment #3 from Tim Haines <thaines.astro at gmail dot com> ---
Hmm. My bugzilla-foo is lacking. I changed too many things at once. The
underlying issue is that the error checks for the returns from the '$GIT
<command>' look to be copy/paste errors from the first check on line 119:
git_shaid=`$GIT rev-parse HEAD`
if [ "x$git_shaid" = "x" ]; then
git_errors="${git_errors+${git_errors}; }error running '$GIT rev-parse
HEAD'"
fi
--
You are receiving this mail because:
You are the assignee for the bug.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Bug releng/31616] Fix git_pretty_rev error,git_build checks in git_version.sh
2024-04-06 17:32 [Bug releng/31616] New: Fix git_pretty_rev error check in git_version.sh thaines.astro at gmail dot com
` (2 preceding siblings ...)
2024-04-06 18:15 ` thaines.astro at gmail dot com
@ 2024-04-11 22:51 ` fche at redhat dot com
3 siblings, 0 replies; 5+ messages in thread
From: fche at redhat dot com @ 2024-04-11 22:51 UTC (permalink / raw)
To: systemtap
https://sourceware.org/bugzilla/show_bug.cgi?id=31616
Frank Ch. Eigler <fche at redhat dot com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|UNCONFIRMED |RESOLVED
Resolution|--- |FIXED
--- Comment #4 from Frank Ch. Eigler <fche at redhat dot com> ---
commit 4c6771bdb456
--
You are receiving this mail because:
You are the assignee for the bug.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-11 22:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-06 17:32 [Bug releng/31616] New: Fix git_pretty_rev error check in git_version.sh thaines.astro at gmail dot com
2024-04-06 17:56 ` [Bug releng/31616] " fche at redhat dot com
2024-04-06 18:12 ` [Bug releng/31616] Fix git_pretty_rev error,git_build checks " thaines.astro at gmail dot com
2024-04-06 18:15 ` thaines.astro at gmail dot com
2024-04-11 22:51 ` fche at redhat dot com
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).