help: add shell-path to --build-options

nasamuffin · gitster · commit 39f4919dc50f · 2020-05-12T22:02:17.000-07:00
It may be useful to know which shell Git was built to try to point to,
in the event that shell-based Git commands are failing. $SHELL_PATH is
set during the build and used to launch the manpage viewer, as well as
by git-compat-util.h, and it's used during tests. 'git version
--build-options' is encouraged for use in bug reports, so it makes sense
to include this information there.

Signed-off-by: Emily Shaffer &lt;emilyshaffer@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/help.c b/help.c
@@ -641,6 +641,7 @@ void get_version_info(struct strbuf *buf, int show_build_options)
 			strbuf_addstr(buf, "no commit associated with this build\n");
 		strbuf_addf(buf, "sizeof-long: %d\n", (int)sizeof(long));
 		strbuf_addf(buf, "sizeof-size_t: %d\n", (int)sizeof(size_t));
+		strbuf_addf(buf, "shell-path: %s\n", SHELL_PATH);
 		/* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -641,6 +641,7 @@ void get_version_info(struct strbuf *buf, int show_build_options)`
`641`	`641`	`strbuf_addstr(buf, "no commit associated with this build\n");`
`642`	`642`	`strbuf_addf(buf, "sizeof-long: %d\n", (int)sizeof(long));`
`643`	`643`	`strbuf_addf(buf, "sizeof-size_t: %d\n", (int)sizeof(size_t));`
	`644`	`+ strbuf_addf(buf, "shell-path: %s\n", SHELL_PATH);`
`644`	`645`	`/* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */`
`645`	`646`	`}`
`646`	`647`	`}`