From: Johannes Sixt Date: Thu, 23 Apr 2009 13:49:06 GMT Subject: [PATCH 2/2] builtin-help: silently tolerate unknown keys Message-ID: <1240494546-25775-2-git-send-email-j6t@kdbg.org> In-Reply-To: <1240494546-25775-1-git-send-email-j6t@kdbg.org> If for some reason the config file contains a key without a subkey like [man] foo = bar then even a plain git help produces an error message. With this patch such an entry is ignored. Additionally, the warning about unknown sub-keys is removed. It could become annoying if new sub-keys are introduced in the future, and then the configuration is read by an old version of git that does not know about it. Signed-off-by: Johannes Sixt --- builtin-help.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/builtin-help.c b/builtin-help.c index 9b57a74..e7fbe9a 100644 --- a/builtin-help.c +++ b/builtin-help.c @@ -236,7 +236,7 @@ static int add_man_viewer_info(const char *var, const char *value) const char *subkey = strrchr(name, '.'); if (!subkey) - return error("Config with no key for man viewer: %s", name); + return 0; if (!strcmp(subkey, ".path")) { if (!value) @@ -249,7 +249,6 @@ static int add_man_viewer_info(const char *var, const char *value) return add_man_viewer_cmd(name, subkey - name, value); } - warning("'%s': unsupported man viewer sub key.", subkey); return 0; } -- 1.6.3.rc1.88.g1bf9