From owner-svn-src-projects@freebsd.org Thu Jul 16 20:44:04 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B3D4736D713 for ; Thu, 16 Jul 2020 20:44:04 +0000 (UTC) (envelope-from gjb@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B75nw4M5Gz44fn; Thu, 16 Jul 2020 20:44:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 78E60E34F; Thu, 16 Jul 2020 20:44:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06GKi45W091920; Thu, 16 Jul 2020 20:44:04 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06GKi4uA091919; Thu, 16 Jul 2020 20:44:04 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202007162044.06GKi4uA091919@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 16 Jul 2020 20:44:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r363261 - projects/release-git X-SVN-Group: projects X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: projects/release-git X-SVN-Commit-Revision: 363261 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jul 2020 20:44:04 -0000 Author: gjb Date: Thu Jul 16 20:44:04 2020 New Revision: 363261 URL: https://svnweb.freebsd.org/changeset/base/363261 Log: Move GIT_CMD a few lines down, so it is not in between SVN_* lines. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: projects/release-git/Makefile.inc1 Modified: projects/release-git/Makefile.inc1 ============================================================================== --- projects/release-git/Makefile.inc1 Thu Jul 16 20:43:28 2020 (r363260) +++ projects/release-git/Makefile.inc1 Thu Jul 16 20:44:04 2020 (r363261) @@ -478,14 +478,6 @@ SVN_CMD= ${_P}/${_S} . endfor .export SVN_CMD .endif -.if !defined(GIT_CMD) || empty(GIT_CMD) -. for _P in /usr/bin /usr/local/bin -. if exists(${_P}/git) -GIT_CMD= ${_P}/git -. endif -. endfor -.export GIT_CMD -.endif SVNFLAGS?= -r HEAD .if !defined(VCS_REVISION) || empty(VCS_REVISION) .if !defined(SVNVERSION_CMD) || empty(SVNVERSION_CMD) @@ -503,6 +495,15 @@ _VCS_REVISION?= $$(eval ${SVNVERSION_CMD} ${SRCDIR}) VCS_REVISION= $$(echo r${_VCS_REVISION}) . endif .export VCS_REVISION +.endif + +.if !defined(GIT_CMD) || empty(GIT_CMD) +. for _P in /usr/bin /usr/local/bin +. if exists(${_P}/git) +GIT_CMD= ${_P}/git +. endif +. endfor +.export GIT_CMD .endif .if !defined(OSRELDATE)