| commit | 00e302da76591f2bda43d9bf58bf366729ee485c | |
| author | Carlo Marcelo Arenas Belón <carenas@gmail.com> | |
| Sun, 8 Aug 2021 03:38:34 +0000 (7 20:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Aug 2021 16:48:01 +0000 (9 09:48 -0700) | ||
| tree | 61fe2eaae140b2f5ad54e45bf20e3b06eef053eb | treesnapshot (tar.gz zip) |
| parent | 1a2b985fb375e7ce14932bfc59365024af2fb6ab | commitdiff |
builtin/merge: avoid -Wformat-extra-args from ancient Xcode
d540b70c85 (merge: cleanup messages like commit, 2019-04-17) adds
a way to change part of the helper text using a single call to
strbuf_add_commented_addf but with two formats with varying number
of parameters.
this trigger a warning in old versions of Xcode (ex 8.0), so use
instead two independent calls with a matching number of parameters
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
d540b70c85 (merge: cleanup messages like commit, 2019-04-17) adds
a way to change part of the helper text using a single call to
strbuf_add_commented_addf but with two formats with varying number
of parameters.
this trigger a warning in old versions of Xcode (ex 8.0), so use
instead two independent calls with a matching number of parameters
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |