summaryrefslogtreecommitdiffstats
path: root/Documentation/doc-diff
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2018-08-31 08:33:16 +0200
committerJunio C Hamano <gitster@pobox.com>2018-08-31 20:49:49 +0200
commit83d4b5ff29ee4a67e1a7269de5c9ec913a467bef (patch)
treeb87e3798710493737afb6ef66e2556eccc258ed0 /Documentation/doc-diff
parentdoc-diff: always use oids inside worktree (diff)
downloadgit-83d4b5ff29ee4a67e1a7269de5c9ec913a467bef.tar.xz
git-83d4b5ff29ee4a67e1a7269de5c9ec913a467bef.zip
doc-diff: fix non-portable 'man' invocation
doc-diff invokes 'man' with the -l option to force "local" mode, however, neither MacOS nor FreeBSD recognize this option. On those platforms, if the argument to 'man' contains a slash, it is automatically interpreted as a file specification, so a "local"-like mode is not needed. And, it turns out, 'man' which does support -l falls back to enabling -l automatically if it can't otherwise find a manual entry corresponding to the argument. Since doc-diff always passes an absolute path of the nroff source file to 'man', the -l option kicks in anyhow, despite not being specified explicitly. Therefore, make the invocation portable to the various platforms by simply dropping -l. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/doc-diff')
-rwxr-xr-xDocumentation/doc-diff2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index c430fe7c99..6ce040ea05 100755
--- a/Documentation/doc-diff
+++ b/Documentation/doc-diff
@@ -77,7 +77,7 @@ generate_render_makefile () {
printf '%s: %s\n' "$dst" "$src"
printf '\t@echo >&2 " RENDER $(notdir $@)" && \\\n'
printf '\tmkdir -p $(dir $@) && \\\n'
- printf '\tMANWIDTH=80 man -l $< >$@+ && \\\n'
+ printf '\tMANWIDTH=80 man $< >$@+ && \\\n'
printf '\tmv $@+ $@\n'
done
}