Merge branch 'js/async-thread' into next

* js/async-thread:
  fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
This commit is contained in:
Junio C Hamano
2010-06-13 11:23:40 -07:00

View File

@@ -483,12 +483,14 @@ static void dump_marks(void);
static NORETURN void die_nicely(const char *err, va_list params)
{
static int zombie;
char message[2 * PATH_MAX];
vreportf("fatal: ", err, params);
vsnprintf(message, sizeof(message), err, params);
fputs("fatal: ", stderr);
fputs(message, stderr);
fputc('\n', stderr);
if (!zombie) {
char message[2 * PATH_MAX];
zombie = 1;
write_crash_report(message);
end_packfile();