aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2022-12-19 04:07:11 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2023-01-03 14:27:53 +0000
commita0c50eda2987334cb165802250b5f5ee9b5cffea (patch)
tree60fa20ac2209de120cd25592578ed73633680514
parent01143ba1189b5a2cbbe58cd3eea4c2eb22e04e57 (diff)
downloadsrc-a0c50eda2987334cb165802250b5f5ee9b5cffea.tar.gz
src-a0c50eda2987334cb165802250b5f5ee9b5cffea.zip
beinstall.sh: Check correct exit status
When retrieving the timestamp of the last commit using git-show(1), do not pipe the output to head(1), otherwise the return value in $? will be for head(1) and not git-show(1). Approved by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37742
-rwxr-xr-xtools/build/beinstall.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/build/beinstall.sh b/tools/build/beinstall.sh
index 46c65d87e61a..dfb3c4d64083 100755
--- a/tools/build/beinstall.sh
+++ b/tools/build/beinstall.sh
@@ -181,7 +181,7 @@ MERGEMASTER_CMD="${srcdir}/usr.sbin/mergemaster/mergemaster.sh"
# May be a worktree, in which case .git is a file, not a directory.
if [ -e .git ] ; then
- commit_time=$(git show --format='%ct' 2>/dev/null | head -1)
+ commit_time=$(git show -s --format='%ct' 2>/dev/null)
[ $? -ne 0 ] && errx "Can't lookup git commit timestamp"
commit_ts=$(date -r ${commit_time} '+%Y%m%d.%H%M%S')
elif [ -d .svn ] ; then