Date: Fri, 10 Sep 2021 17:10:23 -0600 From: Warner Losh <imp@bsdimp.com> To: John Baldwin <jhb@freebsd.org> Cc: git@freebsd.org Subject: Re: git: 3b96abbab033 - main - make: fix MAKE_JOB_ERROR_TOKEN Message-ID: <CANCZdfrs1dDLu_e=d04MvaaGMtnr2v%2BF=FPDXHuwH6-kmEXPDg@mail.gmail.com> In-Reply-To: <3ea29521-42f0-614b-0b0a-4ade132a9c9d@FreeBSD.org> References: <202109102011.18AKBsb3022349@gitrepo.freebsd.org> <3ea29521-42f0-614b-0b0a-4ade132a9c9d@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000f8041605cbac385d Content-Type: text/plain; charset="UTF-8" Hey John, On Fri, Sep 10, 2021 at 4:30 PM John Baldwin <jhb@freebsd.org> 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 <sjg@FreeBSD.org> > 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 <sjg@FreeBSD.org> > AuthorDate: 2021-09-10 20:11:28 +0000 > Commit: Simon J. Gerraty <sjg@FreeBSD.org> > 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: <If and which Problem Report is related.> > # Reported by: <If someone else reported the issue.> > # Reviewed by: <If someone else reviewed your modification.> > # Approved by: <If you needed approval for this commit.> > # Obtained from: <If the change is from a third party.> > # MFC after: <N [day[s]|week[s]|month[s]]. Request a reminder > email> > # MFH: <Ports tree branch name. Request approval for merge.> > # Relnotes: <Set to 'yes' for mention in release notes.> > # Security: <Vulnerability reference (one per line) or > description.> > # Sponsored by: <If the change was sponsored by an organization.> > # Pull Request: <https://github.com/freebsd/<repo>/pull/###> > # Differential Revision: <https://reviews.freebsd.org/D###> > # > # "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: <If someone else reported the issue.> > # Reviewed by: <If someone else reviewed your modification.> > # Approved by: <If you needed approval for this commit.> > # Obtained from: <If the change is from a third party.> > # MFC after: <N [day[s]|week[s]|month[s]]. Request a reminder > email> > # MFH: <Ports tree branch name. Request approval for merge.> > # Relnotes: <Set to 'yes' for mention in release notes.> > # Security: <Vulnerability reference (one per line) or > description.> > # Sponsored by: <If the change was sponsored by an organization.> > # Pull Request: <https://github.com/freebsd/<repo>/pull/###> > # Differential Revision: <https://reviews.freebsd.org/D###> > # > # "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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrs1dDLu_e=d04MvaaGMtnr2v%2BF=FPDXHuwH6-kmEXPDg>