From owner-svn-src-projects@freebsd.org Tue Aug 25 22:35:45 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 BD8B83BE89D for ; Tue, 25 Aug 2020 22:35:45 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BbkNJ4pPtz4Fqh; Tue, 25 Aug 2020 22:35:44 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: by mail-qt1-x831.google.com with SMTP id o22so251826qtt.13; Tue, 25 Aug 2020 15:35:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=mIvIUjFABhyxg8ViJeg01BEILFTZm3f3yi2DFgh28Qg=; b=QrwPWQBJLqJILw5kAlsaI2J98rOJtAdwUSMW/FrahecyF+hP9RR7dclmQUlLv5U211 IsYBKlOOcXhmoeZrZIJU9JAVPf3vwdBgBpEKY35jPM74DcpmCSbYIF1q3sPcjIw/qr+n OoRvA8yDaRBYIdWi94lqFews50lBPErrgELbd1wnMKVyVDOsnC+BNJc+dDHe1A+iqKAt uucEkN4FaHXq4uulH2PXgEQXixzqPpcuxH/OpntQZR+wX8LsnWg0zWcOmgB+P80RGJvE ZczETYBfBsyI2GdpFfNl+XpGuXSVOrTCkxz4L4HtVUAeWJ4LKUEbc/E06FfW4UXL/T5r sYaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=mIvIUjFABhyxg8ViJeg01BEILFTZm3f3yi2DFgh28Qg=; b=uXWDvyTSEOeV1QynltY0/VfK+dJeCCIlvKNtq9aabVA7YVd/vTq4dUqecygQi+dMJf owSiehT0E4bgqfIJNmPfOCqFP4Oyi5027zDw3NwcEHWtgjTEln0ixe23vZCdF/BN5IRU EC0U0Y1ZRfYiyNVpPOqDWWAXMHf9MZcHfOojfTKF8pAlp0G4OVLQVB0Z08Wlzw3FJKLg RCMW8XkL+w1wpNKAOJCKBMr+Zlz/yfJ+IlLZQEUieS04GuYrp4lzE9Em+U0IlWipuo4A 9wYW0RLI0rcQWcYQ3s/M60NuTbFtM+alUdwWbJj4ctXKdbO/z3qrZ+mOBuIVHn0IrKv6 mV1A== X-Gm-Message-State: AOAM533P2fYv2cwsrEDkbofmMjMiDOR8cxYXMkJOQgsC5wsR3oKMSi48 0HyRfBysoOdau0Py3pYH0773paOWn4E= X-Google-Smtp-Source: ABdhPJzJXo7wVbnIpoYzeGaR5uJiaR03Gk6E73hW3DECva6yfN/2BhTXKSromt8QLjWmSi6Pe7tRWA== X-Received: by 2002:ac8:4d94:: with SMTP id a20mr11409101qtw.169.1598394943224; Tue, 25 Aug 2020 15:35:43 -0700 (PDT) Received: from mbp.home (200-12-5-188.rev.tribenet.com.br. [200.12.5.188]) by smtp.gmail.com with ESMTPSA id o72sm184952qka.113.2020.08.25.15.35.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 Aug 2020 15:35:42 -0700 (PDT) Sender: Renato Botelho Subject: Re: svn commit: r364778 - projects/release-git/release To: Glen Barber , src-committers@freebsd.org, svn-src-projects@freebsd.org References: <202008251830.07PIUCit042115@repo.freebsd.org> From: Renato Botelho Message-ID: Date: Tue, 25 Aug 2020 19:35:39 -0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.1.1 MIME-Version: 1.0 In-Reply-To: <202008251830.07PIUCit042115@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4BbkNJ4pPtz4Fqh X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=QrwPWQBJ; dmarc=none; spf=pass (mx1.freebsd.org: domain of gargabsd@gmail.com designates 2607:f8b0:4864:20::831 as permitted sender) smtp.mailfrom=gargabsd@gmail.com X-Spamd-Result: default: False [-1.17 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.75)[-0.745]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; NEURAL_HAM_SHORT(-0.23)[-0.226]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::831:from]; FORGED_SENDER(0.30)[garga@FreeBSD.org,gargabsd@gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[garga@FreeBSD.org,gargabsd@gmail.com]; MAILMAN_DEST(0.00)[svn-src-projects] 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: Tue, 25 Aug 2020 22:35:45 -0000 On 25/08/20 15:30, Glen Barber wrote: > Author: gjb > Date: Tue Aug 25 18:30:12 2020 > New Revision: 364778 > URL: https://svnweb.freebsd.org/changeset/base/364778 > > Log: > Fix the current working directory when setting GITREV and > GITBRANCH. > > Sponsored by: Rubicon Communications, LLC (netgate.com) > > Modified: > projects/release-git/release/Makefile.inc1 > > Modified: projects/release-git/release/Makefile.inc1 > ============================================================================== > --- projects/release-git/release/Makefile.inc1 Tue Aug 25 18:22:30 2020 (r364777) > +++ projects/release-git/release/Makefile.inc1 Tue Aug 25 18:30:12 2020 (r364778) > @@ -16,11 +16,11 @@ GIT_CMD= ${_P}/git > > # Set the git branch and hash to export where needed. > .if !defined(GITBRANCH) || empty(GITBRANCH) > -GITBRANCH!= ${GIT_CMD} rev-parse --abbrev-ref HEAD 2>/dev/null | sed -e 's/\^\///' > +GITBRANCH!= cd ${.CURDIR} && ${GIT_CMD} rev-parse --abbrev-ref HEAD 2>/dev/null | sed -e 's/\^\///' > .export GITBRANCH > .endif > .if !defined(GITREV) || empty(GITREV) > -GITREV!= ${GIT_CMD} rev-parse --verify --short HEAD 2>/dev/null || true > +GITREV!= cd ${.CURDIR} && ${GIT_CMD} rev-parse --verify --short HEAD 2>/dev/null || true Hi Glen! It would be simpler if you use git -C parameter instead.