Merge branch 'sb/merge-recursive-copy-paste-fix'

diff --git a/trace.c b/trace.c
index 54aaee58183f880365caa1986824054a4533797e..b6f25a23fdf8b6eec64181b5d6b56909bbe4ae7b 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -216,7 +216,7 @@ void trace_argv_printf(const char **argv, const char *format, ...)
        va_end(ap);
 }
 
-void trace_strbuf(const char *key, const struct strbuf *data)
+void trace_strbuf(struct trace_key *key, const struct strbuf *data)
 {
        trace_strbuf_fl(NULL, 0, key, data);
 }