commit 34d8815f9512 ("checkpatch: add --showfile to allow input via pipe to show filenames") broke the --emacs with --file option. Fix it.
Showing the changes to scripts/checkpatch.pl (1 of 1 file). Show all
Unified · Split
| @@ -2166,7 +2166,11 @@ sub process { · 2165 unmodified lines | ||
| 2166 | 2166 | if ($showfile) { |
| 2167 | 2167 | $prefix = "$realfile:$realline: " |
| 2168 | 2168 | } elsif ($emacs) { |
| 2169 | − $prefix = "$filename:$linenr: "; | |
| 2169 | + if ($file) { | |
| 2170 | + $prefix = "$filename:$realline: "; | |
| 2171 | + } else { | |
| 2172 | + $prefix = "$filename:$linenr: "; | |
| 2173 | + } | |
| 2170 | 2174 | } |
| 2171 | 2175 | |
| 2172 | 2176 | if ($found_file) { |