Commit 4a593c34 authored by Du, Changbin's avatar Du, Changbin Committed by Linus Torvalds

checkpatch: add support to check already applied git commits

It's sometimes useful to scan already committed patches.

Add --git <revision range> to scan specific or multiple commits.

Single commits are scanned with
	--git <rev>
Multiple commits are scanned with
	--git <range>
	--git <commit>-<count>

[joe@perches.com:
o Don't exec git for each <commit>-<count>,
  use a single "git log -<count> <commit>"
o Consolidate the git exec for the <range> and <commit>-<count> variants
o Output 12 character commit hash ids
o Don't scan git commit merges
o Use -M to reduce the size of rename commits]
Signed-off-by: default avatar"Du, Changbin" <changbin.du@intel.com>
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3beb42ec
...@@ -27,6 +27,7 @@ my $emacs = 0; ...@@ -27,6 +27,7 @@ my $emacs = 0;
my $terse = 0; my $terse = 0;
my $showfile = 0; my $showfile = 0;
my $file = 0; my $file = 0;
my $git = 0;
my $check = 0; my $check = 0;
my $check_orig = 0; my $check_orig = 0;
my $summary = 1; my $summary = 1;
...@@ -69,6 +70,16 @@ Options: ...@@ -69,6 +70,16 @@ Options:
--emacs emacs compile window format --emacs emacs compile window format
--terse one line per report --terse one line per report
--showfile emit diffed file position, not input file position --showfile emit diffed file position, not input file position
-g, --git treat FILE as a single commit or git revision range
single git commit with:
<rev>
<rev>^
<rev>~n
multiple git commits with:
<rev1>..<rev2>
<rev1>...<rev2>
<rev>-<count>
git merges are ignored
-f, --file treat FILE as regular source file -f, --file treat FILE as regular source file
--subjective, --strict enable more subjective tests --subjective, --strict enable more subjective tests
--list-types list the possible message types --list-types list the possible message types
...@@ -174,6 +185,7 @@ GetOptions( ...@@ -174,6 +185,7 @@ GetOptions(
'terse!' => \$terse, 'terse!' => \$terse,
'showfile!' => \$showfile, 'showfile!' => \$showfile,
'f|file!' => \$file, 'f|file!' => \$file,
'g|git!' => \$git,
'subjective!' => \$check, 'subjective!' => \$check,
'strict!' => \$check, 'strict!' => \$check,
'ignore=s' => \@ignore, 'ignore=s' => \@ignore,
...@@ -788,10 +800,42 @@ my @fixed_inserted = (); ...@@ -788,10 +800,42 @@ my @fixed_inserted = ();
my @fixed_deleted = (); my @fixed_deleted = ();
my $fixlinenr = -1; my $fixlinenr = -1;
# If input is git commits, extract all commits from the commit expressions.
# For example, HEAD-3 means we need check 'HEAD, HEAD~1, HEAD~2'.
die "$P: No git repository found\n" if ($git && !-e ".git");
if ($git) {
my @commits = ();
for my $commit_expr (@ARGV) {
my $git_range;
if ($commit_expr =~ m/-/) {
my @tmp = split(/-/, $commit_expr);
die "$P: incorrect git commits expression $commit_expr$!\n"
if (@tmp != 2);
$git_range = "-$tmp[1] $tmp[0]";
} elsif ($commit_expr =~ m/\.\./) {
$git_range = "$commit_expr";
}
if (defined $git_range) {
my $lines = `git log --no-merges --pretty=format:'%H' $git_range`;
foreach my $line (split(/\n/, $lines)) {
unshift(@commits, $line);
}
} else {
unshift(@commits, $commit_expr);
}
}
die "$P: no git commits after extraction!\n" if (@commits == 0);
@ARGV = @commits;
}
my $vname; my $vname;
for my $filename (@ARGV) { for my $filename (@ARGV) {
my $FILE; my $FILE;
if ($file) { if ($git) {
open($FILE, '-|', "git format-patch -M --stdout -1 $filename") ||
die "$P: $filename: git format-patch failed - $!\n";
} elsif ($file) {
open($FILE, '-|', "diff -u /dev/null $filename") || open($FILE, '-|', "diff -u /dev/null $filename") ||
die "$P: $filename: diff failed - $!\n"; die "$P: $filename: diff failed - $!\n";
} elsif ($filename eq '-') { } elsif ($filename eq '-') {
...@@ -802,6 +846,8 @@ for my $filename (@ARGV) { ...@@ -802,6 +846,8 @@ for my $filename (@ARGV) {
} }
if ($filename eq '-') { if ($filename eq '-') {
$vname = 'Your patch'; $vname = 'Your patch';
} elsif ($git) {
$vname = "Commit " . substr($filename, 0, 12) . `git log -1 --pretty=format:' ("%s")' $filename`;
} else { } else {
$vname = $filename; $vname = $filename;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment