builtin/merge: avoid -Wformat-extra-args from ancient Xcode
PATCH 1/1 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
--- builtin/merge.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
builtin/merge.c +5 -3
@@ -861,9 +861,11 @@ static void prepare_to_commit(struct commit_list *remoteheads)strbuf_commented_addf (&msg,"\n" ); }strbuf_commented_addf (&msg,_ (merge_editor_comment)); -strbuf_commented_addf (&msg,_ (cleanup_mode ==COMMIT_MSG_CLEANUP_SCISSORS ? - scissors_editor_comment : - no_scissors_editor_comment), comment_line_char); +if (cleanup_mode ==COMMIT_MSG_CLEANUP_SCISSORS ) +strbuf_commented_addf (&msg,_ (scissors_editor_comment)); +else +strbuf_commented_addf (&msg, +_ (no_scissors_editor_comment), comment_line_char); }if (signoff)append_signoff (&msg,ignore_non_trailer (msg.buf, msg.len),0 );
Signature · 1 line
2.33.0.rc1.373.gc715f1a457
Quoted 7 lines · Carlo Marcelo Arenas Belón
d540b70c85(merge: cleanup messages like commit, 2019-04-17) adds a way to change part of the helper text using a single call tostrbuf_add_commented_addfbut 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
In general, if only an old version of a compiler complains, I'd prefer to either silence it (by loosening the -W options in config.mak.dev for systems without clang4), or just ignore it.
That said, in this case...
builtin/merge.c static void prepare_to_commit(struct commit_list *remoteheads) · line 868
Quoted 8 lines
builtin/merge.c +5
-3-strbuf_commented_addf (&msg,_ (cleanup_mode ==COMMIT_MSG_CLEANUP_SCISSORS ? - scissors_editor_comment : - no_scissors_editor_comment), comment_line_char); +if (cleanup_mode ==COMMIT_MSG_CLEANUP_SCISSORS ) +strbuf_commented_addf (&msg,_ (scissors_editor_comment)); +else +strbuf_commented_addf (&msg, +_ (no_scissors_editor_comment), comment_line_char);
I think the result is actually easier to follow, as we can see that in the CLEANUP_SCISSORS code we do not care about comment_line_char.
Thanks for the cleanup.
-Peff