[PATCH] Add --info-path and --man-path options to git.
- From
Jon Seymour <jon.seymour@gmail.com>
- Date
- May 1, 2011, 08:16 UTC
- Message-ID
- <1304237785-56101-1-git-send-email-jon.seymour@gmail.com>
To better support git extensions provided by 3rd parties which would like to install their own man pages and Info files in the same place as git's own man pages and Info files add support for --man-path and --info-path options.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com> --- Documentation/git.txt | 10 +++++++++- Makefile | 4 +++- git.c | 8 +++++++- 3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt index e4d43a9..c495322 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -9,7 +9,7 @@ git - the stupid content tracker SYNOPSIS -------- [verse] -'git' [--version] [--exec-path[=<path>]] [--html-path] +'git' [--version] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path] [-p|--paginate|--no-pager] [--no-replace-objects] [--bare] [--git-dir=<path>] [--work-tree=<path>] [-c <name>=<value>] @@ -285,6 +285,14 @@ help ...`. Print the path to wherever your git HTML documentation is installed and exit. +--man-path:: + Print the path to wherever your git man pages are installed + and exit. + +--info-path:: + Print the path to wherever your git Info files are installed + and exit. + -p:: --paginate:: Pipe all output into 'less' (or if set, $PAGER) if standard diff --git a/Makefile b/Makefile index f5308fe..9119aaa 100644 --- a/Makefile +++ b/Makefile @@ -1684,7 +1684,9 @@ strip: $(PROGRAMS) git$X git.o: common-cmds.h git.s git.o: EXTRA_CPPFLAGS = -DGIT_VERSION='"$(GIT_VERSION)"' \ - '-DGIT_HTML_PATH="$(htmldir_SQ)"' + '-DGIT_HTML_PATH="$(htmldir_SQ)"' \ + '-DGIT_MAN_PATH="$(mandir_SQ)"' \ + '-DGIT_INFO_PATH="$(infodir_SQ)"' git$X: git.o $(BUILTIN_OBJS) $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \ diff --git a/git.c b/git.c index ef598c3..60a9403 100644 --- a/git.c +++ b/git.c @@ -6,7 +6,7 @@ #include "run-command.h" const char git_usage_string[] = - "git [--version] [--exec-path[=<path>]] [--html-path]\n" + "git [--version] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" " [-p|--paginate|--no-pager] [--no-replace-objects]\n" " [--bare] [--git-dir=<path>] [--work-tree=<path>]\n" " [-c name=value] [--help]\n" @@ -95,6 +95,12 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) } else if (!strcmp(cmd, "--html-path")) { puts(system_path(GIT_HTML_PATH)); exit(0); + } else if (!strcmp(cmd, "--man-path")) { + puts(system_path(GIT_MAN_PATH)); + exit(0); + } else if (!strcmp(cmd, "--info-path")) { + puts(system_path(GIT_INFO_PATH)); + exit(0); } else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) { use_pager = 1; } else if (!strcmp(cmd, "--no-pager")) {
-- 1.7.5.rc3.46.g7f712.dirty