Commit 69f4ce55 authored by Junio C Hamano's avatar Junio C Hamano

send-email: do not reverse the command line arguments

The loop picks elements from @argv one by one, sifts them into arguments
meant for format-patch and the script itself, and pushes them to @files
and @rev_list_opts arrays.  Pick elements from @argv starting at the
beginning using shift, instead of at the end using pop, as push appends
them to the end of the array.
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 7f871c6e
......@@ -421,7 +421,7 @@ ($)
# Now that all the defaults are set, process the rest of the command line
# arguments and collect up the files that need to be processed.
my @rev_list_opts;
while (my $f = pop @ARGV) {
while (defined(my $f = shift @ARGV)) {
if ($f eq "--") {
push @rev_list_opts, "--", @ARGV;
@ARGV = ();
......
......@@ -300,4 +300,17 @@ test_expect_success 'detects ambiguous reference/file conflict' '
grep disambiguate errors
'
test_expect_success 'feed two files' '
rm -fr outdir &&
git format-patch -2 -o outdir &&
GIT_SEND_EMAIL_NOTTY=1 git send-email \
--dry-run \
--from="Example <[email protected]>" \
[email protected] \
outdir/000?-*.patch 2>errors >out &&
grep "^Subject: " out >subjects &&
test "z$(sed -n -e 1p subjects)" = "zSubject: [PATCH 1/2] Second." &&
test "z$(sed -n -e 2p subjects)" = "zSubject: [PATCH 2/2] add master"
'
test_done
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