Commit e90114c2 authored by Joe Perches's avatar Joe Perches Committed by James Toy

If a person sets a separator, it's only used if --nomultiline is set.

Don't make the command line also include --nomultiline in that case.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 6ca6e06f
...@@ -105,6 +105,10 @@ if ($#ARGV < 0) { ...@@ -105,6 +105,10 @@ if ($#ARGV < 0) {
die "$P: argument missing: patchfile or -f file please\n"; die "$P: argument missing: patchfile or -f file please\n";
} }
if ($output_separator ne ", ") {
$output_multiline = 0;
}
my $selections = $email + $scm + $status + $subsystem + $web; my $selections = $email + $scm + $status + $subsystem + $web;
if ($selections == 0) { if ($selections == 0) {
usage(); usage();
...@@ -376,6 +380,7 @@ MAINTAINER field selection options: ...@@ -376,6 +380,7 @@ MAINTAINER field selection options:
Output type options: Output type options:
--separator [, ] => separator for multiple entries on 1 line --separator [, ] => separator for multiple entries on 1 line
using --separator also sets --nomultiline if --separator is not [, ]
--multiline => print 1 entry per line --multiline => print 1 entry per line
Other options: Other options:
......
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