Skip to content

Commit e8cb499

Browse files
committed
Merge branch 'sr/add--interactive-term-readkey'
* sr/add--interactive-term-readkey: git-add--interactive: warn if module for interactive.singlekey is missing git-config: document interactive.singlekey requires Term::ReadKey
2 parents 56e2874 + b294097 commit e8cb499

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Documentation/config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@ interactive.singlekey::
16431643
linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1],
16441644
linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this
16451645
setting is silently ignored if portable keystroke input
1646-
is not available.
1646+
is not available; requires the Perl module Term::ReadKey.
16471647

16481648
log.abbrevCommit::
16491649
If true, makes linkgit:git-log[1], linkgit:git-show[1], and

git-add--interactive.perl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
Term::ReadKey->import;
5959
$use_readkey = 1;
6060
};
61+
if (!$use_readkey) {
62+
print STDERR "missing Term::ReadKey, disabling interactive.singlekey\n";
63+
}
6164
eval {
6265
require Term::Cap;
6366
my $termcap = Term::Cap->Tgetent;

0 commit comments

Comments
 (0)