Emily Shaffer <emilyshaffer@xxxxxxxxxx> writes: > +#ifdef _MSC_VER > + strbuf_addf(info, "MSVC version: %s\n", _MSC_FULL_VER); > +#endif This part is a bit different from what Dscho suggested to be squashed (and I have had on top of v9 series). Below is a diff between (v9 + SQUASH???) and v10. I think the change in the strftime format is a strict improvement. Thanks. bugreport.c | 2 +- compat/compiler.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bugreport.c b/bugreport.c index 5073c901cd..089b939a87 100644 --- a/bugreport.c +++ b/bugreport.c @@ -73,7 +73,7 @@ int cmd_main(int argc, const char **argv) int report = -1; time_t now = time(NULL); char *option_output = NULL; - char *option_suffix = "%F-%H%M"; + char *option_suffix = "%Y-%m-%d-%H%M"; int nongit_ok = 0; const char *prefix = NULL; const char *user_relative_path = NULL; diff --git a/compat/compiler.h b/compat/compiler.h index ac90fa051d..ce6a7f6de9 100644 --- a/compat/compiler.h +++ b/compat/compiler.h @@ -16,8 +16,7 @@ static inline void get_compiler_info(struct strbuf *info) #endif #ifdef _MSC_VER - strbuf_addf(info, "MSVC version: %02d.%02d.%05d\n", - _MSC_VER / 100, _MSC_VER % 100, _MSC_FULL_VER % 100000); + strbuf_addf(info, "MSVC version: %s\n", _MSC_FULL_VER); #endif if (len == info->len)
