From 8e566f24b369836c43d720e4246a152b0e7724c6 Mon Sep 17 00:00:00 2001 From: Sergei Organov Date: Thu, 6 Dec 2007 21:33:01 +0300 Subject: Let git-help prefer man-pages installed with this version of git Prepend $(prefix)/share/man to the MANPATH environment variable before invoking 'man' from help.c:show_man_page(). There may be other git documentation in the user's MANPATH but the user is asking a specific instance of git about its own documentation, so we'd better show the documentation for _that_ instance of git. Signed-off-by: Sergei Organov Signed-off-by: Junio C Hamano --- help.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'help.c') diff --git a/help.c b/help.c index 37a9c25db7..f935887d34 100644 --- a/help.c +++ b/help.c @@ -239,6 +239,27 @@ void list_common_cmds_help(void) } } +static void setup_man_path(void) +{ + struct strbuf new_path; + const char *old_path = getenv("MANPATH"); + + strbuf_init(&new_path, 0); + + /* We should always put ':' after our path. If there is no + * old_path, the ':' at the end will let 'man' to try + * system-wide paths after ours to find the manual page. If + * there is old_path, we need ':' as delimiter. */ + strbuf_addstr(&new_path, GIT_MAN_PATH); + strbuf_addch(&new_path, ':'); + if (old_path) + strbuf_addstr(&new_path, old_path); + + setenv("MANPATH", new_path.buf, 1); + + strbuf_release(&new_path); +} + static void show_man_page(const char *git_cmd) { const char *page; @@ -254,6 +275,7 @@ static void show_man_page(const char *git_cmd) page = p; } + setup_man_path(); execlp("man", "man", page, NULL); } -- cgit v1.2.3