From nobody Tue Jan 03 14:32:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NmZvY6dZJz2np43; Tue, 3 Jan 2023 14:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NmZvY69Rnz3LB4; Tue, 3 Jan 2023 14:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672756361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HR6QqQCsc0TGxo+LRL1CQsAxhp+QA86Jg10I+7HL2XQ=; b=N/GiWO7UhM3PG7v69Evhy2dSA+acTnLXXHAohHhAEyhOdJYvm3E/zgOQzPJYrZJekTQMm5 6ZEEP70VOX8ioRtYWxQPiuqXlH8TLLQS1rJsG4gJvqXeSSc42AfzqYwtiK1DEaiPc33Drl 36wlUuODKzRdaRhFDbEZPYEmZ78nNFElyOzJ6XhxXUgpV7xi2TzZjRI73n0PmbYWNjC1OK trHHLHM9MIF63HArDc3hXsrbfABHQnFTCNd9ACaehGHxxEkJfoLfcXZMqDGFjT8W/Irrym 4U9nixy/mP/xqGD7xX0AHebEVI5/RBvdwyAL5biBNZssqxAM4rDbsAurlzEcXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672756361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HR6QqQCsc0TGxo+LRL1CQsAxhp+QA86Jg10I+7HL2XQ=; b=CVUHXojoHUPkKfP6DuKtWeUoUeb7ZGIdiXqfUDSspBsQcFzny1klXvMSwZO+GmKn5if/1l rvf7SH4rWPQgiV2m5Fgx9tlH0mPJ3VD78zX8FtxUCmZfwSLER4wzqmHjH6xRlESjl67SsF 4VeK68RLiI4p7hAG6FHzL0pMlRUgG+VROliwStaPtkjTStzGhI4Gkp29ZDrUuVSDjqWtMR OavGqHmtr/9xs81YMZVCtUZpWrkrLKVvwC3hiJSGfEcxwScAu2hrwR5IC6BdQigdPfsYm4 3FL63XsZ8+KWVeayCLxyJs2ZI4OWAXRSrBImgv6B3xqSfqWCpFBZPzsirAfTfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672756361; a=rsa-sha256; cv=none; b=gX/wc1g2MTtbAXbWRlLwDmZs7unVAiVhavKMbVyFT3siMrqnTx4/YeibSzgF7O4fXtaD7i fd3PAKFZFrydx7BClJNRFWAxargUFc7JPe8KiEjBlTzf6eCKJmKmSxpNekGXkCwJugOtp3 6sDlf1wlo+bLag2YhsL5fVtrQBI/r2D/LIafeWFVh0gLrmj1WRUvQxwK5h+Ti7bXj9YxY3 icawjqj9lo6ZZ9qnOZcEZDYQy6KjYvgZJP4M4tAfcFeZ0WlGDdz7265DAJ/W6nCXkg0A2W /MqXRW00bqANor3tSIn95fiZy+3TIGviJI8C1+/JNSU8VZImGXEkULu+pdsGXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NmZvY5CQfzbHd; Tue, 3 Jan 2023 14:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 303EWfHk033488; Tue, 3 Jan 2023 14:32:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 303EWfwR033487; Tue, 3 Jan 2023 14:32:41 GMT (envelope-from git) Date: Tue, 3 Jan 2023 14:32:41 GMT Message-Id: <202301031432.303EWfwR033487@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: a0c50eda2987 - main - beinstall.sh: Check correct exit status List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0c50eda2987334cb165802250b5f5ee9b5cffea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=a0c50eda2987334cb165802250b5f5ee9b5cffea commit a0c50eda2987334cb165802250b5f5ee9b5cffea Author: Joseph Mingrone AuthorDate: 2022-12-19 04:07:11 +0000 Commit: Joseph Mingrone CommitDate: 2023-01-03 14:27:53 +0000 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 --- tools/build/beinstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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