messages: capitalization and punctuation exceptions

These are conscious violations of the usual rules for error messages, based on this reasoning: - If an error message is directly followed by another sentence, it needs to be properly terminated with a period, lest the grammar looks broken and becomes hard to read. - That second sentence isn't actually an error message any more, so it should abide to conventional language rules for good looks and legibility. Arguably, these should be converted to advice messages (which the user can squelch, too), but that's a much bigger effort to get right. - Neither of these apply to the first hunk in do_exec(), but this two-line message looks just too much like a real sentence to not terminate it. Also, leaving it alone would make it asymmetrical to the other hunk. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Oswald Buddenhagen committed Apr 28, 2023 at 14:56 UTC b734fe49fddb4bbd02f471fa3b11d3605bd6921d
2 files changed +3 -3
builtin/pull.c
+1 -1
@@ -1049,7 +1049,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
1049 if (!opt_autostash)
1050 require_clean_work_tree(the_repository,
1051 N_("pull with rebase"),
1052 - _("please commit or stash them."), 1, 0);
1052 + _("Please commit or stash them."), 1, 0);
1053
1054 if (get_rebase_fork_point(&rebase_fork_point, repo, *refspecs))
1055 oidclr(&rebase_fork_point);
sequencer.c
+2 -2
@@ -3626,13 +3626,13 @@ static int do_exec(struct repository *r, const char *command_line)
3626 "\n"),
3627 command_line,
3628 dirty ? _("and made changes to the index and/or the "
3629 - "working tree\n") : "");
3629 + "working tree.\n") : "");
3630 if (status == 127)
3631 /* command not found */
3632 status = 1;
3633 } else if (dirty) {
3634 warning(_("execution succeeded: %s\nbut "
3635 - "left changes to the index and/or the working tree\n"
3635 + "left changes to the index and/or the working tree.\n"
3636 "Commit or stash your changes, and then run\n"
3637 "\n"
3638 " git rebase --continue\n"