diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:27:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:27:21 -0700 |
| commit | e8cb4996adc59e3fd17ac4068cecbb5439f3fcfc (patch) | |
| tree | 952319e3a3bfb1979eaaee98aa19e2045819eb7a | |
| parent | Merge branch 'sh/write-pack-file-warning-message-fix' (diff) | |
| parent | git-add--interactive: warn if module for interactive.singlekey is missing (diff) | |
| download | tgif-e8cb4996adc59e3fd17ac4068cecbb5439f3fcfc.tar.xz | |
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
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rwxr-xr-x | git-add--interactive.perl | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0e1dde3fff..79e576878a 100644 --- 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 24bb1ab992..d3bca12611 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -58,6 +58,9 @@ if ($repo->config_bool("interactive.singlekey")) { 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; |