From nobody Mon Sep 19 18:34:51 2022 X-Original-To: dev-commits-src-branches@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 4MWYHw2TXqz4cRwm; Mon, 19 Sep 2022 18:34:52 +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 4MWYHw1zLyz3nBg; Mon, 19 Sep 2022 18:34:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663612492; 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=DppUxqemaeUAcbFrAR4azTHQJG3Ak1slTCr5hZXR8e8=; b=r6hutilRoBdhSLM4L9hFmftFz7R8M+0/L0FW8qncfu+aPRDT0y5IlvyTdaz9DsSNvHTmWg QPNq2/6EDcMWhjZr2Oe5/E3A8+QniDF2WHwtDlIx2sGuioR0+CTR+gwr2rBJf+/8gRywH0 Wk2aF6xEZ1WheKNMCQ30b301tRyYhGVCbueO7dx5UCtrZ7oOsIsiv2EH41Toa3uMJ+9M4l NPaENdYf4XA6b8sMseQ2RxN8pPT4eWAxbjC+ywskYiogaIAIqnzWLUzWJlNYA5KaOCav9S PCiKN7VT78aLGyFw9hFpFxOI6LDZu7HIAQX/rwPD1ZySeZVTDKZ1+KB5m+qbjw== 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 4MWYHw0wGSzSZp; Mon, 19 Sep 2022 18:34:52 +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 28JIYp2o062041; Mon, 19 Sep 2022 18:34:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28JIYpoB062040; Mon, 19 Sep 2022 18:34:51 GMT (envelope-from git) Date: Mon, 19 Sep 2022 18:34:51 GMT Message-Id: <202209191834.28JIYpoB062040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: bb4cbe9b9e61 - stable/12 - newvers.sh: avoid bare git invocation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: bb4cbe9b9e61246604669a75809dcd316c8661c1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663612492; 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=DppUxqemaeUAcbFrAR4azTHQJG3Ak1slTCr5hZXR8e8=; b=D1CuOT50gZrLiXUEvHzI8jz9MzbpPp/ZLFFHy1KoJta610z+EO2HB6UW4KZMpGhiEDluzq ++t/1xEd7hIdYRloOgLr0/M9JgFm9J0QxYkP215q5FlyrTb1n9VxOtedgcW0KR34udxIWX h1121GSS0iwLK8Ec/Sl3h5sIvNM/SfbyL73UGMXUcQA7EmdFUA4DMsz24II2fG12PFUhIO 8njaxWwD/MLaSDHfXxIh2TlAlUnLq6/3JTUFM9HXL+SqKV1u67rwAn5HouZOd2fGkw59Wz +tZV9RqITfqhPih1gFZnVJd3QZb6W/dTHoF5NLET2CO8TaqJP/8+ZcfBndJJzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663612492; a=rsa-sha256; cv=none; b=eEpgNxVMoGrNLrD0vh7cBd6+r6NGyPkbICMef5VcDGRlxN//X6lN/LAAEPr8j3tcco2x37 4dKLSnaBOabGVLeZylZfYHQZ14nGK9oJ1Xh73jxBM2wqMklS4ktdry/lCeNMSi+GHCbW91 WUUVLR2wIDGYsfRqDy4FsdhOayMgWOM4fLmrK/nL3AhZDWlyrbtljDfkWey4a4eG9fHQli IrNw9r9NBgvJM55msJdtIctn3H/cYHYeFsB0jz7QjRzImdrv5TqRR0RUsoUbSBS8OPr5h6 HzE9rK/LcG0w7kwgxOnKhdLn3nbGGwPI5dMHPgGSamKrtcoRQmboPi7PRKAPtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bb4cbe9b9e61246604669a75809dcd316c8661c1 commit bb4cbe9b9e61246604669a75809dcd316c8661c1 Author: Ed Maste AuthorDate: 2021-01-21 15:00:20 +0000 Commit: Ed Maste CommitDate: 2022-09-19 18:18:58 +0000 newvers.sh: avoid bare git invocation git may not be in the path, and $git_cmd includes some commandline arguments. Reported by: mjg Tested by: mjg (cherry picked from commit 9e98065cf17d0e4831928a5acbd7bc75a351c7f6) --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index f8511a3f5912..e5a36c449643 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -221,7 +221,7 @@ fi if [ -n "$git_cmd" ] ; then git=$($git_cmd rev-parse --verify --short HEAD 2>/dev/null) - if [ "$(git rev-parse --is-shallow-repository)" = false ] ; then + if [ "$($git_cmd rev-parse --is-shallow-repository)" = false ] ; then git_cnt=$($git_cmd rev-list --first-parent --count HEAD 2>/dev/null) if [ -n "$git_cnt" ] ; then git="n${git_cnt}-${git}"