From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Joe Perches <joe@perches.com>
Cc: Andy Whitcroft <apw@canonical.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] checkpatch: Remove obsolete period from "ambiguous SHA1" query
Date: Fri, 30 Aug 2019 10:17:31 -0700 [thread overview]
Message-ID: <20190830171731.GB15405@linux.intel.com> (raw)
In-Reply-To: <19c9b30b3d77a65c6c4289a2eeeb6cbe40594aab.camel@perches.com>
On Fri, Aug 30, 2019 at 09:37:51AM -0700, Joe Perches wrote:
> On Fri, 2019-08-30 at 09:31 -0700, Sean Christopherson wrote:
> > Git dropped the period from its "ambiguous SHA1" error message in commit
> > 0c99171ad2 ("get_short_sha1: mark ambiguity error for translation"),
> > circa 2016. Drop the period from checkpatch's associated query so as to
> > match both the old and new error messages.
> >
> > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
> > ---
> > scripts/checkpatch.pl | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> > index 93a7edfe0f05..ef3642c53100 100755
> > --- a/scripts/checkpatch.pl
> > +++ b/scripts/checkpatch.pl
> > @@ -962,7 +962,7 @@ sub git_commit_info {
> >
> > return ($id, $desc) if ($#lines < 0);
> >
> > - if ($lines[0] =~ /^error: short SHA1 $commit is ambiguous\./) {
> > + if ($lines[0] =~ /^error: short SHA1 $commit is ambiguous/) {
> > # Maybe one day convert this block of bash into something that returns
> > # all matching commit ids, but it's very slow...
> > #
>
> Thanks.
>
> Did git ever change to actually support human readable
> messages in multiple languages?
Yep, e.g.:
error: Kurzer SHA-1 745f ist mehrdeutig.
> If so, this won't work for non-english output.
Yep again. The next check for 'fatal: ambiguous argument' obviously fails
as well and checkpatch ends up using git's error message as the id and
description.
ERROR: Please use git ... - ie: 'commit error: Kurze ("")'
next prev parent reply other threads:[~2019-08-30 17:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-30 16:31 [PATCH] checkpatch: Remove obsolete period from "ambiguous SHA1" query Sean Christopherson
2019-08-30 16:37 ` Joe Perches
2019-08-30 17:17 ` Sean Christopherson [this message]
2019-08-30 18:01 ` Joe Perches
2019-08-30 18:29 ` Joe Perches
2019-09-01 19:29 ` [PATCH] checkpatch: Make git output use LANGUAGE=en_US.utf8 Joe Perches
2019-09-03 15:19 ` Sean Christopherson
2019-09-03 16:08 ` [PATCH] checkpatch: Remove obsolete period from "ambiguous SHA1" query Sean Christopherson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190830171731.GB15405@linux.intel.com \
--to=sean.j.christopherson@intel.com \
--cc=akpm@linux-foundation.org \
--cc=apw@canonical.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).