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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0e1dde3fffc70ff8903e23392dfa7d534d435013..79e576878af5eb44b21fc0763faeb30519e022c3 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1643,7 +1643,7 @@ interactive.singlekey::
        linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1],
        linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this
        setting is silently ignored if portable keystroke input
-       is not available.
+       is not available; requires the Perl module Term::ReadKey.
 
 log.abbrevCommit::
        If true, makes linkgit:git-log[1], linkgit:git-show[1], and

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 24bb1ab9929d2cbf117051ed0e4edeb37b0efaea..d3bca1261110014b2b969f6d2fc1d73dca424204 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -58,6 +58,9 @@
                Term::ReadKey->import;
                $use_readkey = 1;
        };
+       if (!$use_readkey) {
+               print STDERR "missing Term::ReadKey, disabling interactive.singlekey\n";
+       }
        eval {
                require Term::Cap;
                my $termcap = Term::Cap->Tgetent;