diff mbox series

[RFC] scripts/checkpatch: roll diff tweaking into checkpatch itself

Message ID 20210607171829.25111-1-alex.bennee@linaro.org
State Superseded
Headers show
Series [RFC] scripts/checkpatch: roll diff tweaking into checkpatch itself | expand

Commit Message

Alex Bennée June 7, 2021, 5:18 p.m. UTC
Rather than relying on external tweaks lets just do it inside
checkpatch's direct commitish handling which is QEMU specific code
anyway.

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 .gitlab-ci.d/static_checks.yml | 3 ---
 .patchew.yml                   | 3 ---
 scripts/checkpatch.pl          | 7 ++++++-
 3 files changed, 6 insertions(+), 7 deletions(-)

-- 
2.20.1

Comments

Daniel P. Berrangé June 7, 2021, 5:29 p.m. UTC | #1
On Mon, Jun 07, 2021 at 06:18:29PM +0100, Alex Bennée wrote:
> Rather than relying on external tweaks lets just do it inside

> checkpatch's direct commitish handling which is QEMU specific code

> anyway.

> 

> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  .gitlab-ci.d/static_checks.yml | 3 ---

>  .patchew.yml                   | 3 ---

>  scripts/checkpatch.pl          | 7 ++++++-

>  3 files changed, 6 insertions(+), 7 deletions(-)


Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>



Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Willian Rampazzo June 7, 2021, 6:07 p.m. UTC | #2
On Mon, Jun 7, 2021 at 2:18 PM Alex Bennée <alex.bennee@linaro.org> wrote:
>

> Rather than relying on external tweaks lets just do it inside

> checkpatch's direct commitish handling which is QEMU specific code

> anyway.

>

> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  .gitlab-ci.d/static_checks.yml | 3 ---

>  .patchew.yml                   | 3 ---

>  scripts/checkpatch.pl          | 7 ++++++-

>  3 files changed, 6 insertions(+), 7 deletions(-)

>


Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Philippe Mathieu-Daudé June 8, 2021, 6:35 a.m. UTC | #3
On 6/7/21 7:18 PM, Alex Bennée wrote:
> Rather than relying on external tweaks lets just do it inside

> checkpatch's direct commitish handling which is QEMU specific code

> anyway.

> 

> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  .gitlab-ci.d/static_checks.yml | 3 ---

>  .patchew.yml                   | 3 ---

>  scripts/checkpatch.pl          | 7 ++++++-

>  3 files changed, 6 insertions(+), 7 deletions(-)


Clever.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Wainer dos Santos Moschetta June 8, 2021, 12:52 p.m. UTC | #4
On 6/7/21 2:18 PM, Alex Bennée wrote:
> Rather than relying on external tweaks lets just do it inside

> checkpatch's direct commitish handling which is QEMU specific code

> anyway.

>

> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>   .gitlab-ci.d/static_checks.yml | 3 ---

>   .patchew.yml                   | 3 ---

ah, there is the patchew configuration file.
>   scripts/checkpatch.pl          | 7 ++++++-

>   3 files changed, 6 insertions(+), 7 deletions(-)


Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>


>

> diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml

> index 7e685c6a65..c5fa4fce26 100644

> --- a/.gitlab-ci.d/static_checks.yml

> +++ b/.gitlab-ci.d/static_checks.yml

> @@ -4,9 +4,6 @@ check-patch:

>     needs:

>       job: amd64-centos8-container

>     script:

> -    - git config --local diff.renamelimit 0

> -    - git config --local diff.renames True

> -    - git config --local diff.algorithm histogram

>       - .gitlab-ci.d/check-patch.py

>     variables:

>       GIT_DEPTH: 1000

> diff --git a/.patchew.yml b/.patchew.yml

> index 2638b7f564..1b78262ce5 100644

> --- a/.patchew.yml

> +++ b/.patchew.yml

> @@ -138,9 +138,6 @@ testing:

>         script: |

>           #!/bin/bash

>           git rev-parse base > /dev/null || exit 0

> -        git config --local diff.renamelimit 0

> -        git config --local diff.renames True

> -        git config --local diff.algorithm histogram

>           ./scripts/checkpatch.pl --mailback base..

>       docker-mingw@fedora:

>         enabled: true

> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl

> index bbcd25ae05..cb8eff233e 100755

> --- a/scripts/checkpatch.pl

> +++ b/scripts/checkpatch.pl

> @@ -399,7 +399,12 @@ if ($chk_branch) {

>   	my $num_patches = @patches;

>   	for my $hash (@patches) {

>   		my $FILE;

> -		open($FILE, '-|', "git", "show", "--patch-with-stat", $hash) ||

> +		open($FILE, '-|', "git",

> +                     "-c", "diff.renamelimit=0",

> +                     "-c", "diff.renames=True",

> +                     "-c", "diff.algorithm=histogram",

> +                     "show",

> +                     "--patch-with-stat", $hash) ||

>   			die "$P: git show $hash - $!\n";

>   		while (<$FILE>) {

>   			chomp;
diff mbox series

Patch

diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml
index 7e685c6a65..c5fa4fce26 100644
--- a/.gitlab-ci.d/static_checks.yml
+++ b/.gitlab-ci.d/static_checks.yml
@@ -4,9 +4,6 @@  check-patch:
   needs:
     job: amd64-centos8-container
   script:
-    - git config --local diff.renamelimit 0
-    - git config --local diff.renames True
-    - git config --local diff.algorithm histogram
     - .gitlab-ci.d/check-patch.py
   variables:
     GIT_DEPTH: 1000
diff --git a/.patchew.yml b/.patchew.yml
index 2638b7f564..1b78262ce5 100644
--- a/.patchew.yml
+++ b/.patchew.yml
@@ -138,9 +138,6 @@  testing:
       script: |
         #!/bin/bash
         git rev-parse base > /dev/null || exit 0
-        git config --local diff.renamelimit 0
-        git config --local diff.renames True
-        git config --local diff.algorithm histogram
         ./scripts/checkpatch.pl --mailback base..
     docker-mingw@fedora:
       enabled: true
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index bbcd25ae05..cb8eff233e 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -399,7 +399,12 @@  if ($chk_branch) {
 	my $num_patches = @patches;
 	for my $hash (@patches) {
 		my $FILE;
-		open($FILE, '-|', "git", "show", "--patch-with-stat", $hash) ||
+		open($FILE, '-|', "git",
+                     "-c", "diff.renamelimit=0",
+                     "-c", "diff.renames=True",
+                     "-c", "diff.algorithm=histogram",
+                     "show",
+                     "--patch-with-stat", $hash) ||
 			die "$P: git show $hash - $!\n";
 		while (<$FILE>) {
 			chomp;