2021-09-14 01:29:04

by Peter Collingbourne

[permalink] [raw]
Subject: [PATCH] checkpatch.pl: use correct gitroot when running from non-top-level dir

My workflow usually requires running checkpatch.pl from a subdirectory
of the kernel source tree. This works for the most part, but the script
will be unable to find the .git directory and will therefore refuse to
run any git commands (so, e.g. commit ID verification will fail). Fix
it by prepending $root to $gitroot when a root is set.

This also requires fixing one root directory assumption in a git
invocation.

Signed-off-by: Peter Collingbourne <[email protected]>
Link: https://linux-review.googlesource.com/id/I33dc5f38e2bfcd95c8ea59933bba5305cce50404
---
scripts/checkpatch.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index c27d2312cfc3..171c5993efb4 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -434,6 +434,8 @@ if ($tree) {
print "Must be run from the top-level dir. of a kernel tree\n";
exit(2);
}
+
+ $gitroot = "$root/$gitroot";
}

my $emitted_corrupt = 0;
@@ -1131,7 +1133,7 @@ sub seed_camelcase_includes {
}

if (-e "$gitroot") {
- $files = `${git_command} ls-files "include/*.h"`;
+ $files = `${git_command} ls-files "$root/include/*.h"`;
@include_files = split('\n', $files);
}

--
2.33.0.309.g3052b89438-goog


2022-02-24 01:04:58

by Peter Collingbourne

[permalink] [raw]
Subject: Re: [PATCH] checkpatch.pl: use correct gitroot when running from non-top-level dir

On Mon, Sep 13, 2021 at 4:33 PM Peter Collingbourne <[email protected]> wrote:
>
> My workflow usually requires running checkpatch.pl from a subdirectory
> of the kernel source tree. This works for the most part, but the script
> will be unable to find the .git directory and will therefore refuse to
> run any git commands (so, e.g. commit ID verification will fail). Fix
> it by prepending $root to $gitroot when a root is set.
>
> This also requires fixing one root directory assumption in a git
> invocation.

Ping.

Peter

2022-11-04 17:29:15

by Peter Collingbourne

[permalink] [raw]
Subject: Re: [PATCH] checkpatch.pl: use correct gitroot when running from non-top-level dir

On Wed, Feb 23, 2022 at 2:32 PM Peter Collingbourne <[email protected]> wrote:
>
> On Mon, Sep 13, 2021 at 4:33 PM Peter Collingbourne <[email protected]> wrote:
> >
> > My workflow usually requires running checkpatch.pl from a subdirectory
> > of the kernel source tree. This works for the most part, but the script
> > will be unable to find the .git directory and will therefore refuse to
> > run any git commands (so, e.g. commit ID verification will fail). Fix
> > it by prepending $root to $gitroot when a root is set.
> >
> > This also requires fixing one root directory assumption in a git
> > invocation.
>
> Ping.

Ping^2.

Peter