diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-10 16:35:19 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-23 13:32:50 +0200 |
| commit | 1a5c63ce88e92de163c592505c2e2153476b9345 (patch) | |
| tree | 69098d7373d9bbb45f8101be84daac317629bd17 | |
| parent | edd7541b8ce25c1180eb5435ff3350a76d0f0b95 (diff) | |
| download | qemu-1a5c63ce88e92de163c592505c2e2153476b9345.zip qemu-1a5c63ce88e92de163c592505c2e2153476b9345.tar.gz qemu-1a5c63ce88e92de163c592505c2e2153476b9345.tar.bz2 | |
checkpatch: fix filename detection when using -f
Fix $realfile filename when using -f/--file to not remove first level
directory as if the filename was used in a -P1 patch. Only strip the
first level directory (typically a or b) for P1 patches.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(extracted from Linux commit 2b7ab45395dc4d91ef30985f76d90a8f28f58c27)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rwxr-xr-x | scripts/checkpatch.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 42e1c50..0553634 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1367,10 +1367,10 @@ sub process { # extract the filename as it passes if ($line =~ /^diff --git.*?(\S+)$/) { $realfile = $1; - $realfile =~ s@^([^/]*)/@@; + $realfile =~ s@^([^/]*)/@@ if (!$file); } elsif ($line =~ /^\+\+\+\s+(\S+)/) { $realfile = $1; - $realfile =~ s@^([^/]*)/@@; + $realfile =~ s@^([^/]*)/@@ if (!$file); $p1_prefix = $1; if (!$file && $tree && $p1_prefix ne '' && |