mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'es/bugreport-shell'
"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
This commit is contained in:
commit
ce095ecfe4
|
@ -29,6 +29,7 @@ The following information is captured automatically:
|
||||||
- uname sysname, release, version, and machine strings
|
- uname sysname, release, version, and machine strings
|
||||||
- Compiler-specific info string
|
- Compiler-specific info string
|
||||||
- A list of enabled hooks
|
- A list of enabled hooks
|
||||||
|
- $SHELL
|
||||||
|
|
||||||
This tool is invoked via the typical Git setup process, which means that in some
|
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
|
cases, it might not be able to launch - for example, if a relevant config file
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
static void get_system_info(struct strbuf *sys_info)
|
static void get_system_info(struct strbuf *sys_info)
|
||||||
{
|
{
|
||||||
struct utsname uname_info;
|
struct utsname uname_info;
|
||||||
|
char *shell = NULL;
|
||||||
|
|
||||||
/* get git version from native cmd */
|
/* get git version from native cmd */
|
||||||
strbuf_addstr(sys_info, _("git version:\n"));
|
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: "));
|
strbuf_addstr(sys_info, _("compiler info: "));
|
||||||
get_compiler_info(sys_info);
|
get_compiler_info(sys_info);
|
||||||
|
|
||||||
strbuf_addstr(sys_info, _("libc info: "));
|
strbuf_addstr(sys_info, _("libc info: "));
|
||||||
get_libc_info(sys_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)
|
static void get_populated_hooks(struct strbuf *hook_info, int nongit)
|
||||||
|
|
1
help.c
1
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_addstr(buf, "no commit associated with this build\n");
|
||||||
strbuf_addf(buf, "sizeof-long: %d\n", (int)sizeof(long));
|
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, "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? */
|
/* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue