From nobody Fri Sep 10 22:29:59 2021 X-Original-To: git@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 4529517A71C1 for ; Fri, 10 Sep 2021 22:30:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H5rCs17pvz3GF9 for ; Fri, 10 Sep 2021 22:30:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id C2A1C6988 for ; Fri, 10 Sep 2021 22:30:00 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Fwd: git: 3b96abbab033 - main - make: fix MAKE_JOB_ERROR_TOKEN References: <202109102011.18AKBsb3022349@gitrepo.freebsd.org> To: git@FreeBSD.org From: John Baldwin X-Forwarded-Message-Id: <202109102011.18AKBsb3022349@gitrepo.freebsd.org> Message-ID: <3ea29521-42f0-614b-0b0a-4ade132a9c9d@FreeBSD.org> Date: Fri, 10 Sep 2021 15:29:59 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 In-Reply-To: <202109102011.18AKBsb3022349@gitrepo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N Do the pre-push hooks check for log messages containing the template? It might be nice to reject pushes that add commits with the template in the log message to help catch accidents. -------- Forwarded Message -------- Subject: git: 3b96abbab033 - main - make: fix MAKE_JOB_ERROR_TOKEN Date: Fri, 10 Sep 2021 20:11:54 GMT From: Simon J. Gerraty To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=3b96abbab03327176b1e4ee02a6742bf9807dd75 commit 3b96abbab03327176b1e4ee02a6742bf9807dd75 Author: Simon J. Gerraty AuthorDate: 2021-09-10 20:11:28 +0000 Commit: Simon J. Gerraty CommitDate: 2021-09-10 20:11:28 +0000 make: fix MAKE_JOB_ERROR_TOKEN The rework of GetBooleanVar to GetBooleanExpr requires we add "${" and ":U}" around the expression so it can be directly evaluated. Reported by: mjg MFC after: 1 week # # 72 columns --| # # Uncomment and complete these metadata fields, as appropriate: # # PR: # Reported by: # Reviewed by: # Approved by: # Obtained from: # MFC after: # MFH: # Relnotes: # Security: # Sponsored by: # Pull Request: /pull/###> # Differential Revision: # # "Pull Request" and "Differential Revision" require the *full* GitHub or # Phabricator URL. The commit author should be set appropriately, using # `git commit --author` if someone besides the committer sent in the change. # # Uncomment and complete these metadata fields, as appropriate: # # PR: # Reported by: # Reviewed by: # Approved by: # Obtained from: # MFC after: # MFH: # Relnotes: # Security: # Sponsored by: # Pull Request: /pull/###> # Differential Revision: # # "Pull Request" and "Differential Revision" require the *full* GitHub or # Phabricator URL. The commit author should be set appropriately, using # `git commit --author` if someone besides the committer sent in the change. # --- contrib/bmake/job.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/bmake/job.c b/contrib/bmake/job.c index ba2e5c827b0c..e4b77477e816 100644 --- a/contrib/bmake/job.c +++ b/contrib/bmake/job.c @@ -261,7 +261,7 @@ typedef struct ShellWriter { * pass jobs queue to sub-makes. * Use .MAKE.ALWAYS_PASS_JOB_QUEUE=no to disable. */ -#define MAKE_ALWAYS_PASS_JOB_QUEUE ".MAKE.ALWAYS_PASS_JOB_QUEUE" +#define MAKE_ALWAYS_PASS_JOB_QUEUE "${.MAKE.ALWAYS_PASS_JOB_QUEUE:U}" static bool Always_pass_job_queue = true; /* * FreeBSD: aborting entire parallel make isn't always @@ -269,7 +269,7 @@ static bool Always_pass_job_queue = true; * one architecture should not stop all. * We still want to bail on interrupt though. */ -#define MAKE_JOB_ERROR_TOKEN "MAKE_JOB_ERROR_TOKEN" +#define MAKE_JOB_ERROR_TOKEN "${MAKE_JOB_ERROR_TOKEN:U}" static bool Job_error_token = true; /* From nobody Fri Sep 10 23:10:23 2021 X-Original-To: git@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 439B617B8B78 for ; Fri, 10 Sep 2021 23:10:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vs1-xe33.google.com (mail-vs1-xe33.google.com [IPv6:2607:f8b0:4864:20::e33]) (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 4H5s6j6WCPz3hCq for ; Fri, 10 Sep 2021 23:10:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vs1-xe33.google.com with SMTP id a21so3005118vsp.12 for ; Fri, 10 Sep 2021 16:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ZsGp3NiOhQ/OmajYd8ITC/MxsIQLMXU5JZzBhwOHW+E=; b=L8GAz+9XUFA79SaYnmdTBf4GhXK8X1tYlOhKMZs/vW/Cw/xgJcViOQrS7IfkCw2oxX LcYG1ir1z+kDN1pa3Tw8fMoAEl+MSlPButyQfcIkrU5oyPN4vSWf+1Xd5bVYpAsBDX3b RvN5JfuILxtfYGwz6gc5NQqUH+LylA0UalTMKnZPxPRGsSPlPQz0mqcxEbGnAlqXlAQt uMaLqymVzcA6YBxNspihE097WcUKCLqsZ1IhDDsEizW0s7yUxPX+vgHP5biLWaZvXDO8 usHDDnVmbgxikXUbQzm6u2ogc/QN5MpesvLij8NDtzGI9bL0ICZldtNVj15LpFe8asgd bqnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZsGp3NiOhQ/OmajYd8ITC/MxsIQLMXU5JZzBhwOHW+E=; b=FHepg9N3ND/bIJf/feEzmhVKV2E+y3MHCycadKLwopyQUP5VhT8lH594Io5w+EHPk5 lcIWXWFUvLYCN/XYLyOUKVCMSwgoymt3enLEu/vHRnsv8gu0RzDCT5wVxW/9lzaLjFhw 3+m5lBMB1QaPgORsSQRhzeo30tPOm6AF62MCJtDWYe+xkibRWYLdH/lxBQuD32jfPOOQ eK6K/0KkPgoIzGSFNQGNAwTSXl9GCV+A5rRlrMKD2k11WN8oXvLBA+aOIYZIjtg4RLTQ /WbddGoLUkJ/kHCgCPILvZCp01cb4ZoN3Yn9UYX89qicPUaJyRxIbb4YR2JSMxuVrR4o tEGg== X-Gm-Message-State: AOAM530TTf11+2anshPJq8t3tLxu32ydT3cOvUyQvdqLlCMGMMnDSG8i WaNaUCoI0/4Pw0r2LT/SItx2e/yo1i4iQITtKJmFXQ== X-Google-Smtp-Source: ABdhPJy/FYJG6ZWk1dDlXRMnEdALrU1gxSUTTrLZUkerNmK6MQ8kix2LIK2Uw6UrfCNXoxzH1WP4GphnJbWQgFnydGI= X-Received: by 2002:a05:6102:2f6:: with SMTP id j22mr7924954vsj.12.1631315434139; Fri, 10 Sep 2021 16:10:34 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <202109102011.18AKBsb3022349@gitrepo.freebsd.org> <3ea29521-42f0-614b-0b0a-4ade132a9c9d@FreeBSD.org> In-Reply-To: <3ea29521-42f0-614b-0b0a-4ade132a9c9d@FreeBSD.org> From: Warner Losh Date: Fri, 10 Sep 2021 17:10:23 -0600 Message-ID: Subject: Re: git: 3b96abbab033 - main - make: fix MAKE_JOB_ERROR_TOKEN To: John Baldwin Cc: git@freebsd.org Content-Type: multipart/alternative; boundary="000000000000f8041605cbac385d" X-Rspamd-Queue-Id: 4H5s6j6WCPz3hCq X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: Y --000000000000f8041605cbac385d Content-Type: text/plain; charset="UTF-8" Hey John, On Fri, Sep 10, 2021 at 4:30 PM John Baldwin wrote: > Do the pre-push hooks check for log messages containing the template? It > might be nice to reject pushes that add commits with the template in the > log message to help catch accidents. > I thought git did this automatically... Warner > -------- Forwarded Message -------- > Subject: git: 3b96abbab033 - main - make: fix MAKE_JOB_ERROR_TOKEN > Date: Fri, 10 Sep 2021 20:11:54 GMT > From: Simon J. Gerraty > To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, > dev-commits-src-main@FreeBSD.org > > The branch main has been updated by sjg: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3b96abbab03327176b1e4ee02a6742bf9807dd75 > > commit 3b96abbab03327176b1e4ee02a6742bf9807dd75 > Author: Simon J. Gerraty > AuthorDate: 2021-09-10 20:11:28 +0000 > Commit: Simon J. Gerraty > CommitDate: 2021-09-10 20:11:28 +0000 > > make: fix MAKE_JOB_ERROR_TOKEN > > The rework of GetBooleanVar to GetBooleanExpr requires > we add "${" and ":U}" around the expression so it can be directly > evaluated. > > Reported by: mjg > MFC after: 1 week > > # > # 72 columns > --| > # > # Uncomment and complete these metadata fields, as appropriate: > # > # PR: > # Reported by: > # Reviewed by: > # Approved by: > # Obtained from: > # MFC after: email> > # MFH: > # Relnotes: > # Security: description.> > # Sponsored by: > # Pull Request: /pull/###> > # Differential Revision: > # > # "Pull Request" and "Differential Revision" require the *full* > GitHub or > # Phabricator URL. The commit author should be set appropriately, > using > # `git commit --author` if someone besides the committer sent in the > change. > # > # Uncomment and complete these metadata fields, as appropriate: > # > # PR: > # Reported by: > # Reviewed by: > # Approved by: > # Obtained from: > # MFC after: email> > # MFH: > # Relnotes: > # Security: description.> > # Sponsored by: > # Pull Request: /pull/###> > # Differential Revision: > # > # "Pull Request" and "Differential Revision" require the *full* > GitHub or > # Phabricator URL. The commit author should be set appropriately, > using > # `git commit --author` if someone besides the committer sent in the > change. > # > --- > contrib/bmake/job.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/contrib/bmake/job.c b/contrib/bmake/job.c > index ba2e5c827b0c..e4b77477e816 100644 > --- a/contrib/bmake/job.c > +++ b/contrib/bmake/job.c > @@ -261,7 +261,7 @@ typedef struct ShellWriter { > * pass jobs queue to sub-makes. > * Use .MAKE.ALWAYS_PASS_JOB_QUEUE=no to disable. > */ > -#define MAKE_ALWAYS_PASS_JOB_QUEUE ".MAKE.ALWAYS_PASS_JOB_QUEUE" > +#define MAKE_ALWAYS_PASS_JOB_QUEUE "${.MAKE.ALWAYS_PASS_JOB_QUEUE:U}" > static bool Always_pass_job_queue = true; > /* > * FreeBSD: aborting entire parallel make isn't always > @@ -269,7 +269,7 @@ static bool Always_pass_job_queue = true; > * one architecture should not stop all. > * We still want to bail on interrupt though. > */ > -#define MAKE_JOB_ERROR_TOKEN "MAKE_JOB_ERROR_TOKEN" > +#define MAKE_JOB_ERROR_TOKEN "${MAKE_JOB_ERROR_TOKEN:U}" > static bool Job_error_token = true; > > /* > > --000000000000f8041605cbac385d-- From nobody Fri Sep 10 23:28:22 2021 X-Original-To: git@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 49AB317C13E1 for ; Fri, 10 Sep 2021 23:28:24 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H5sWD1VFVz3mTW; Fri, 10 Sep 2021 23:28:24 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id C25DC6F39; Fri, 10 Sep 2021 23:28:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: git: 3b96abbab033 - main - make: fix MAKE_JOB_ERROR_TOKEN To: Warner Losh Cc: git@freebsd.org References: <202109102011.18AKBsb3022349@gitrepo.freebsd.org> <3ea29521-42f0-614b-0b0a-4ade132a9c9d@FreeBSD.org> From: John Baldwin Message-ID: Date: Fri, 10 Sep 2021 16:28:22 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 9/10/21 4:10 PM, Warner Losh wrote: > Hey John, > > On Fri, Sep 10, 2021 at 4:30 PM John Baldwin wrote: > >> Do the pre-push hooks check for log messages containing the template? It >> might be nice to reject pushes that add commits with the template in the >> log message to help catch accidents. >> > > I thought git did this automatically... Clearly nothing blocked this push. :) -- John Baldwin