Junio C Hamano wrote:
> > + const char *hint_cleanup_all = allow_empty_message ?
> > + _("Please enter the commit message for your changes."
> > + " Lines starting\nwith '%c' will be ignored.\n") :
> > + _("Please enter the commit message for your changes."
> > + " Lines starting\nwith '%c' will be ignored, and an empty"
> > + " message aborts the commit.\n");
> > + const char *hint_cleanup_space = allow_empty_message ?
> > + _("Please enter the commit message for your changes."
> > + " Lines starting\n"
> > + "with '%c' will be kept; you may remove them"
> > + " yourself if you want to.\n") :
> > + _("Please enter the commit message for your changes."
> > + " Lines starting\n"
> > + "with '%c' will be kept; you may remove them"
> > + " yourself if you want to.\n"
> > + "An empty message aborts the commit.\n");
>
> Local convention in this file seems to be that multi-line ?:
> expressions are folded with ? and : operators at the beginning, not
> at the end, of the lines, e.g. I see this construct in the same file.
>
> reflog_msg = is_from_cherry_pick(whence)
> ? "commit (cherry-pick)"
> : is_from_rebase(whence)
> ? "commit (rebase)"
> : "commit";
>
> So, let's mimick and make the above more like this:
>
> const char *hint_cleanup_all = allow_empty_message
> ? _("Please enter the commit message for your changes."
> " Lines starting\nwith '%c' will be ignored.\n")
> : _("Please enter the commit message for your changes."
> " Lines starting\nwith '%c' will be ignored, and an empty"
> " message aborts the commit.\n");
Another statement several lines below, whose style I conformed to, reads,
status_printf_ln(
s, GIT_COLOR_NORMAL,
whence == FROM_MERGE ?
_("\n"
"It looks like you may be committing a merge.\n"
"If this is not correct, please run\n"
" git update-ref -d MERGE_HEAD\n"
"and try again.\n") :
_("\n"
"It looks like you may be committing a cherry-pick.\n"
"If this is not correct, please run\n"
" git update-ref -d CHERRY_PICK_HEAD\n"
"and try again.\n"));
So I am a little confused which local style convention to follow... :S
$ grep -nE ':$' builtin/commit.c
904: "and try again.\n") :
$ grep -nE '^\s*:' builtin/commit.c
1754: : is_from_rebase(whence)
1756: : "commit";
