From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Jul 2012 20:05:25 +0000 (-0700)
Subject: Merge branch 'jk/maint-advise-vaddf' into maint
X-Git-Tag: v1.7.11.4~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5c992a1326bf2d79a28cb1b0a64ddbc42420073f?hp=2e3710bdf945dbffd89c28bc6c12f7ee7f0f55a8

Merge branch 'jk/maint-advise-vaddf' into maint

The advise() function did not use varargs correctly to format
its message.

* jk/maint-advise-vaddf:
advice: pass varargs to strbuf_vaddf, not strbuf_addf
---

diff --git a/advice.c b/advice.c
index a492eea24f..edfbd4a6fb 100644
--- a/advice.c
+++ b/advice.c
@@ -32,7 +32,7 @@ void advise(const char *advice, ...)
 	const char *cp, *np;
 
 	va_start(params, advice);
-	strbuf_addf(&buf, advice, params);
+	strbuf_vaddf(&buf, advice, params);
 	va_end(params);
 
 	for (cp = buf.buf; *cp; cp = np) {