kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git: add --info-path and --man-path options 

Similar to the way the --html-path option lets UI programs learn where git
has its HTML documentation pages, expose the other two paths used to store
the documentation pages of these two types.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jon Seymour 2011-05-01 18:16:25 +10:00 committed by Junio C Hamano
parent ec014eac0e
commit f2dd8c3799
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/git.txt
View File

@ -9,7 +9,7 @@ git - the stupid content tracker
SYNOPSIS SYNOPSIS
-------- --------
[verse] [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] [-p|--paginate|--no-pager] [--no-replace-objects]
[--bare] [--git-dir=<path>] [--work-tree=<path>] [--bare] [--git-dir=<path>] [--work-tree=<path>]
[-c <name>=<value>] [-c <name>=<value>]
@ -290,6 +290,14 @@ help ...`.
Print the path to wherever your git HTML documentation is installed Print the path to wherever your git HTML documentation is installed
and exit. 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:: -p::
--paginate:: --paginate::
Pipe all output into 'less' (or if set, $PAGER) if standard Pipe all output into 'less' (or if set, $PAGER) if standard

4
Makefile
View File

@ -1676,7 +1676,9 @@ strip: $(PROGRAMS) git$X


git.o: common-cmds.h git.o: common-cmds.h
git.s git.o: EXTRA_CPPFLAGS = -DGIT_VERSION='"$(GIT_VERSION)"' \ 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) git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \ $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \

8
git.c
View File

@ -6,7 +6,7 @@
#include "run-command.h" #include "run-command.h"


const char git_usage_string[] = 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" " [-p|--paginate|--no-pager] [--no-replace-objects]\n"
" [--bare] [--git-dir=<path>] [--work-tree=<path>]\n" " [--bare] [--git-dir=<path>] [--work-tree=<path>]\n"
" [-c name=value] [--help]\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")) { } else if (!strcmp(cmd, "--html-path")) {
puts(system_path(GIT_HTML_PATH)); puts(system_path(GIT_HTML_PATH));
exit(0); 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")) { } else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) {
use_pager = 1; use_pager = 1;
} else if (!strcmp(cmd, "--no-pager")) { } else if (!strcmp(cmd, "--no-pager")) {