Skip to content

Commit

Permalink
checkpatch: remove obsolete period from "ambiguous SHA1" query
Browse files Browse the repository at this point in the history
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/[email protected]
Signed-off-by: Sean Christopherson <[email protected]>
Acked-by: Joe Perches <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Sean Christopherson authored and torvalds committed Sep 26, 2019
1 parent 94fb984 commit 5a7f445
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/checkpatch.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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...
#
Expand Down

0 comments on commit 5a7f445

Please sign in to comment.