t6038 (merge.renormalize): try checkout -m and cherry-pick

diff --git a/http-backend.c b/http-backend.c
index f0e787e37d9384c11d48dbbc35cfb2b1609368e8..44ce6bb32b0e98681f7c523537082065e8cb5fc1 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -488,14 +488,12 @@ static NORETURN void die_webcgi(const char *err, va_list params)
        static int dead;
 
        if (!dead) {
-               char buffer[1000];
                dead = 1;
-
-               vsnprintf(buffer, sizeof(buffer), err, params);
-               fprintf(stderr, "fatal: %s\n", buffer);
                http_status(500, "Internal Server Error");
                hdr_nocache();
                end_headers();
+
+               vreportf("fatal: ", err, params);
        }
        exit(0); /* we successfully reported a failure ;-) */
 }