git-add--interactive: Improve behavior on bogus input

1) Previously, any menu would cause a perl error when entered '0',
   which is never a valid option.

2) Entering a bogus choice (like 998 or 4-2) surprisingly caused
   the same behavior as if the user had just hit 'enter', which
   means to carry out the selected action on the selected items.
   Entering such bogus input is now a no-op and the sub-menu
   doesn't exit.

Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jean-Luc Herren 2007-09-26 16:05:01 +02:00 committed by Junio C Hamano
parent c95c02486c
commit 6a6eb3d09f

View file

@ -219,7 +219,7 @@ sub list_and_choose {
last;
}
chomp $line;
my $donesomething = 0;
last if $line eq '';
for my $choice (split(/[\s,]+/, $line)) {
my $choose = 1;
my ($bottom, $top);
@ -251,12 +251,11 @@ sub list_and_choose {
next TOPLOOP;
}
for ($i = $bottom-1; $i <= $top-1; $i++) {
next if (@stuff <= $i);
next if (@stuff <= $i || $i < 0);
$chosen[$i] = $choose;
$donesomething++;
}
}
last if (!$donesomething || $opts->{IMMEDIATE});
last if ($opts->{IMMEDIATE});
}
for ($i = 0; $i < @stuff; $i++) {
if ($chosen[$i]) {