mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-28 14:35:10 +02:00
Code

Merge branch 'js/bugreport-no-suffix-fix' 

"git bugreport --no-suffix" was not supported and instead
segfaulted, which has been corrected.

* js/bugreport-no-suffix-fix:
  bugreport.c: fix a crash in `git bugreport` with `--no-suffix` option
This commit is contained in:
Junio C Hamano 2024-03-25 16:16:34 -07:00
parent 199074f893 b3b57c69da
commit d921c365ee
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-bugreport.txt
View File

@ -8,7 +8,8 @@ git-bugreport - Collect information for user to file a bug report
SYNOPSIS
--------
[verse]
'git bugreport' [(-o | --output-directory) <path>] [(-s | --suffix) <format>]
'git bugreport' [(-o | --output-directory) <path>]
[(-s | --suffix) <format> | --no-suffix]
[--diagnose[=<mode>]]
DESCRIPTION
@ -51,9 +52,12 @@ OPTIONS
-s <format>::
--suffix <format>::
--no-suffix::
Specify an alternate suffix for the bugreport name, to create a file
named 'git-bugreport-<formatted-suffix>'. This should take the form of a
strftime(3) format string; the current local time will be used.
`--no-suffix` disables the suffix and the file is just named
`git-bugreport` without any disambiguation measure.
--no-diagnose::
--diagnose[=<mode>]::

10
builtin/bugreport.c
View File

@ -64,7 +64,8 @@ static void get_populated_hooks(struct strbuf *hook_info, int nongit)
}
static const char * const bugreport_usage[] = {
N_("git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"
N_("git bugreport [(-o | --output-directory) <path>]\n"
" [(-s | --suffix) <format> | --no-suffix]\n"
" [--diagnose[=<mode>]]"),
NULL
};
@ -138,8 +139,11 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix)
strbuf_complete(&report_path, '/');
output_path_len = report_path.len;
strbuf_addstr(&report_path, "git-bugreport-");
strbuf_addftime(&report_path, option_suffix, localtime_r(&now, &tm), 0, 0);
strbuf_addstr(&report_path, "git-bugreport");
if (option_suffix) {
strbuf_addch(&report_path, '-');
strbuf_addftime(&report_path, option_suffix, localtime_r(&now, &tm), 0, 0);
}
strbuf_addstr(&report_path, ".txt");
switch (safe_create_leading_directories(report_path.buf)) {