Commit 5a7f4455 authored Sep 25, 2019 by Sean Christopherson Committed by Linus Torvalds Sep 25, 2019

checkpatch: remove obsolete period from "ambiguous SHA1" query

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.

Link: http://lkml.kernel.org/r/20190830163103.15914-1-sean.j.christopherson@intel.com

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Acked-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 94fb9845

scripts/checkpatch.pl

+1 −1

Original line number	Diff line number	Diff line
		@@ -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...
		#