summaryrefslogtreecommitdiff
path: root/pager.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-04 02:17:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-09-04 02:17:52 (GMT)
commitfa6d3749edce0a5ba8c9150f984cc307e0092d0d (patch)
tree3ca97911ade88435507d1151fb5885087ccf7f55 /pager.c
parent0b2cef2805a02a9db4a3ba01004dd767af97c692 (diff)
parent9e9de18f1ad39901a8f0c67f0af70d66d427e326 (diff)
downloadgit-fa6d3749edce0a5ba8c9150f984cc307e0092d0d.zip
git-fa6d3749edce0a5ba8c9150f984cc307e0092d0d.tar.gz
git-fa6d3749edce0a5ba8c9150f984cc307e0092d0d.tar.bz2
Merge branch 'jk/fix-alias-pager-config-key-warnings' into maint
Because the configuration system does not allow "alias.0foo" and "pager.0foo" as the configuration key, the user cannot use '0foo' as a custom command name anyway, but "git 0foo" tried to look these keys up and emitted useless warnings before saying '0foo is not a git command'. These warning messages have been squelched. * jk/fix-alias-pager-config-key-warnings: config: silence warnings for command names with invalid keys
Diffstat (limited to 'pager.c')
-rw-r--r--pager.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/pager.c b/pager.c
index 070dc11..27d4c8a 100644
--- a/pager.c
+++ b/pager.c
@@ -150,7 +150,8 @@ int check_pager_config(const char *cmd)
struct strbuf key = STRBUF_INIT;
const char *value = NULL;
strbuf_addf(&key, "pager.%s", cmd);
- if (!git_config_get_value(key.buf, &value)) {
+ if (git_config_key_is_valid(key.buf) &&
+ !git_config_get_value(key.buf, &value)) {
int b = git_config_maybe_bool(key.buf, value);
if (b >= 0)
want = b;