Commit 323b267f authored Apr 16, 2015 by Joe Perches Committed by Linus Torvalds Apr 17, 2015

checkpatch: fix --fix use with a patch of multiple files



If a patch touches multiple files, the --fix and --fix-inplace option
doesn't keep the proper line count and makes the new patch file not able
to be applied via bad offset line numbers when lines are added or deleted
by the --fix option.

Dunno how that extra backslash snuck in there.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent e15f431f

scripts/checkpatch.pl

+1 −1

Original line number	Diff line number	Diff line
		@@ -1690,7 +1690,7 @@ sub fix_inserted_deleted_lines {
		foreach my $old_line (@{$linesRef}) {
		my $save_line = 1;
		my $line = $old_line; #don't modify the array
		if ($line =~ /^(?:\+\+\+\\|\-\-\-)\s+\S+/) { #new filename
		if ($line =~ /^(?:\+\+\+\|\-\-\-)\s+\S+/) { #new filename
		$delta_offset = 0;
		} elsif ($line =~ /^\@\@ -\d+,\d+ \+\d+,\d+ \@\@/) { #new hunk
		$range_last_linenr = $new_linenr;

Admin message