mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'cb/add-p-single-key-fix'
The single-key-input mode in "git add -p" had some code to handle keys that generate a sequence of input via ReadKey(), which did not handle end-of-file correctly, which has been fixed. * cb/add-p-single-key-fix: add -p: avoid use of undefined $key when ReadKey -> EOF
This commit is contained in:
commit
7d53ff402a
|
@ -1175,15 +1175,17 @@ sub prompt_single_character {
|
|||
ReadMode 'cbreak';
|
||||
my $key = ReadKey 0;
|
||||
ReadMode 'restore';
|
||||
if ($use_termcap and $key eq "\e") {
|
||||
while (!defined $term_escapes{$key}) {
|
||||
my $next = ReadKey 0.5;
|
||||
last if (!defined $next);
|
||||
$key .= $next;
|
||||
if (defined $key) {
|
||||
if ($use_termcap and $key eq "\e") {
|
||||
while (!defined $term_escapes{$key}) {
|
||||
my $next = ReadKey 0.5;
|
||||
last if (!defined $next);
|
||||
$key .= $next;
|
||||
}
|
||||
$key =~ s/\e/^[/;
|
||||
}
|
||||
$key =~ s/\e/^[/;
|
||||
print "$key";
|
||||
}
|
||||
print "$key" if defined $key;
|
||||
print "\n";
|
||||
return $key;
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue