diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:34 -0700 |
| commit | 574a31b5b76b82b18e85825385d8594372152a8f (patch) | |
| tree | 5a49cf8482dbd9f8d777bf0de1e350ed2268d266 /builtin/fmt-merge-msg.c | |
| parent | 9a54075c80e8fb30fe267ac57d5e7ef652bc901f (diff) | |
| parent | bc57b9c0cc5a123365a922fa1831177e3fd607ed (diff) | |
| download | git-574a31b5b76b82b18e85825385d8594372152a8f.tar.gz | |
Merge branch 'rs/use-strbuf-addstr' into maint
* rs/use-strbuf-addstr:
use strbuf_addstr() instead of strbuf_addf() with "%s"
use strbuf_addstr() for adding constant strings to a strbuf
Diffstat (limited to 'builtin/fmt-merge-msg.c')
| -rw-r--r-- | builtin/fmt-merge-msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index e5658c320e..ac84e99f3a 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -272,7 +272,7 @@ static int cmp_string_list_util_as_integral(const void *a_, const void *b_) static void add_people_count(struct strbuf *out, struct string_list *people) { if (people->nr == 1) - strbuf_addf(out, "%s", people->items[0].string); + strbuf_addstr(out, people->items[0].string); else if (people->nr == 2) strbuf_addf(out, "%s (%d) and %s (%d)", people->items[0].string, |