diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:53 -0800 |
| commit | 4b51386bbfc5d26e552c3c4be135e31cd2f64b44 (patch) | |
| tree | 5bff7a8a4dee06d92dca0a89976248dc7e571918 /builtin/fast-import.c | |
| parent | bc61dbac770923a96e2007c3de4027c5d11c6d41 (diff) | |
| parent | f5c39c3268107e1f3def70709d509fd24282832c (diff) | |
| download | git-4b51386bbfc5d26e552c3c4be135e31cd2f64b44.tar.gz | |
Merge branch 'ab/usage-die-message'
Code clean-up to hide vreportf() from public API.
* ab/usage-die-message:
config API: use get_error_routine(), not vreportf()
usage.c + gc: add and use a die_message_errno()
gc: return from cmd_gc(), don't call exit()
usage.c API users: use die_message() for error() + exit 128
usage.c API users: use die_message() for "fatal :" + exit 128
usage.c: add a die_message() routine
Diffstat (limited to 'builtin/fast-import.c')
| -rw-r--r-- | builtin/fast-import.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/builtin/fast-import.c b/builtin/fast-import.c index 20406f6775..2b2e28bad7 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -401,16 +401,18 @@ static void dump_marks(void); static NORETURN void die_nicely(const char *err, va_list params) { + va_list cp; static int zombie; - char message[2 * PATH_MAX]; + report_fn die_message_fn = get_die_message_routine(); - vsnprintf(message, sizeof(message), err, params); - fputs("fatal: ", stderr); - fputs(message, stderr); - fputc('\n', stderr); + va_copy(cp, params); + die_message_fn(err, params); if (!zombie) { + char message[2 * PATH_MAX]; + zombie = 1; + vsnprintf(message, sizeof(message), err, cp); write_crash_report(message); end_packfile(); unkeep_all_packs(); |