Merge branch 'ph/pull-rebase-detached'

diff --git a/trace.c b/trace.c
index d95341693fa9b27caed38ffe1308838bedb49f83..5ec0e3bd16b5cfc59254c6e10d4555ef3029aa36 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -62,7 +62,7 @@ static int get_trace_fd(const char *key, int *need_close)
 static const char err_msg[] = "Could not trace into fd given by "
        "GIT_TRACE environment variable";
 
-void trace_vprintf(const char *key, const char *fmt, va_list ap)
+static void trace_vprintf(const char *key, const char *fmt, va_list ap)
 {
        struct strbuf buf = STRBUF_INIT;