When using the --diagnose flag, match the diagnostics zip filename with
the bugreport filename in the scenario where '+i' syntax is used.
Signed-off-by: Jacob Stopak <jacob@xxxxxxxxxxxxxxxx>
---
builtin/bugreport.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/bugreport.c b/builtin/bugreport.c
index 71ee7d7f4b..573d270677 100644
--- a/builtin/bugreport.c
+++ b/builtin/bugreport.c
@@ -112,6 +112,7 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix)
char *prefixed_filename;
size_t output_path_len;
int ret;
+ int i = 1;
const struct option bugreport_options[] = {
OPT_CALLBACK_F(0, "diagnose", &diagnose, N_("mode"),
@@ -142,7 +143,6 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix)
strbuf_addstr(&report_path, ".txt");
if (strbuf_cmp(&option_suffix, &default_option_suffix) == 0) {
- int i = 1;
int pos = report_path.len - 4;
while (file_exists(report_path.buf) && i < 10) {
if (i > 1)
@@ -167,6 +167,7 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix)
strbuf_add(&zip_path, report_path.buf, output_path_len);
strbuf_addstr(&zip_path, "git-diagnostics-");
strbuf_addftime(&zip_path, option_suffix.buf, localtime_r(&now, &tm), 0, 0);
+ if (i > 1) strbuf_addf(&zip_path, "+%d", i-1);
strbuf_addstr(&zip_path, ".zip");
if (create_diagnostics_archive(&zip_path, diagnose))
--
2.42.0.298.gd89efca819.dirty
