All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] checkpatch: fix --fix use with a patch of multiple files
@ 2015-04-14  0:34 Joe Perches
  0 siblings, 0 replies; only message in thread
From: Joe Perches @ 2015-04-14  0:34 UTC (permalink / raw)
  To: Andrew Morton; +Cc: Andy Whitcroft, LKML

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>
---
 scripts/checkpatch.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 78a951f..7207f54 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -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;



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-04-14  0:34 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-14  0:34 [PATCH] checkpatch: fix --fix use with a patch of multiple files Joe Perches

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.