Merge branch 'es/bugreport-shell'

gitster · gitster · commit ce095ecfe497 · 2020-06-08T18:06:28.000-07:00
"git bugreport" learns to report what shell is in use.

* es/bugreport-shell:
  bugreport: include user interactive shell
  help: add shell-path to --build-options
diff --git a/Documentation/git-bugreport.txt b/Documentation/git-bugreport.txt
@@ -29,6 +29,7 @@ The following information is captured automatically:
  - uname sysname, release, version, and machine strings
  - Compiler-specific info string
  - A list of enabled hooks
+ - $SHELL
 
 This tool is invoked via the typical Git setup process, which means that in some
 cases, it might not be able to launch - for example, if a relevant config file
diff --git a/bugreport.c b/bugreport.c
@@ -9,6 +9,7 @@
 static void get_system_info(struct strbuf *sys_info)
 {
 	struct utsname uname_info;
+	char *shell = NULL;
 
 	/* get git version from native cmd */
 	strbuf_addstr(sys_info, _("git version:\n"));
@@ -29,8 +30,13 @@ static void get_system_info(struct strbuf *sys_info)
 
 	strbuf_addstr(sys_info, _("compiler info: "));
 	get_compiler_info(sys_info);
+
 	strbuf_addstr(sys_info, _("libc info: "));
 	get_libc_info(sys_info);
+
+	shell = getenv("SHELL");
+	strbuf_addf(sys_info, "$SHELL (typically, interactive shell): %s\n",
+		    shell ? shell : "<unset>");
 }
 
 static void get_populated_hooks(struct strbuf *hook_info, int nongit)
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`	`}`