Merge branch 'sp/maint-upload-pack-stop-early'

diff --git a/trace.c b/trace.c
index ca0ab0448bd3981e740e99e14935670cae729ede..d95341693fa9b27caed38ffe1308838bedb49f83 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -65,22 +65,17 @@ static const char err_msg[] = "Could not trace into fd given by "
 void trace_vprintf(const char *key, const char *fmt, va_list ap)
 {
        struct strbuf buf = STRBUF_INIT;
-       int fd, need_close = 0;
 
-       fd = get_trace_fd(key, &need_close);
-       if (!fd)
+       if (!trace_want(key))
                return;
 
        set_try_to_free_routine(NULL);  /* is never reset */
        strbuf_vaddf(&buf, fmt, ap);
-       write_or_whine_pipe(fd, buf.buf, buf.len, err_msg);
+       trace_strbuf(key, &buf);
        strbuf_release(&buf);
-
-       if (need_close)
-               close(fd);
 }
 
-void trace_printf_key(const char *key, const char *fmt, ...)
+static void trace_printf_key(const char *key, const char *fmt, ...)
 {
        va_list ap;
        va_start(ap, fmt);
@@ -96,6 +91,20 @@ void trace_printf(const char *fmt, ...)
        va_end(ap);
 }
 
+void trace_strbuf(const char *key, const struct strbuf *buf)
+{
+       int fd, need_close = 0;
+
+       fd = get_trace_fd(key, &need_close);
+       if (!fd)
+               return;
+
+       write_or_whine_pipe(fd, buf->buf, buf->len, err_msg);
+
+       if (need_close)
+               close(fd);
+}
+
 void trace_argv_printf(const char **argv, const char *fmt, ...)
 {
        struct strbuf buf = STRBUF_INIT;
@@ -146,10 +155,11 @@ static const char *quote_crnl(const char *path)
 /* FIXME: move prefix to startup_info struct and get rid of this arg */
 void trace_repo_setup(const char *prefix)
 {
+       static const char *key = "GIT_TRACE_SETUP";
        const char *git_work_tree;
        char cwd[PATH_MAX];
 
-       if (!trace_want("GIT_TRACE"))
+       if (!trace_want(key))
                return;
 
        if (!getcwd(cwd, PATH_MAX))
@@ -161,10 +171,10 @@ void trace_repo_setup(const char *prefix)
        if (!prefix)
                prefix = "(null)";
 
-       trace_printf("setup: git_dir: %s\n", quote_crnl(get_git_dir()));
-       trace_printf("setup: worktree: %s\n", quote_crnl(git_work_tree));
-       trace_printf("setup: cwd: %s\n", quote_crnl(cwd));
-       trace_printf("setup: prefix: %s\n", quote_crnl(prefix));
+       trace_printf_key(key, "setup: git_dir: %s\n", quote_crnl(get_git_dir()));
+       trace_printf_key(key, "setup: worktree: %s\n", quote_crnl(git_work_tree));
+       trace_printf_key(key, "setup: cwd: %s\n", quote_crnl(cwd));
+       trace_printf_key(key, "setup: prefix: %s\n", quote_crnl(prefix));
 }
 
 int trace_want(const char *key)