Skip to content

Commit b734fe4

Browse files
ossilatorgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d45cbe3 commit b734fe4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

builtin/pull.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
10491049
if (!opt_autostash)
10501050
require_clean_work_tree(the_repository,
10511051
N_("pull with rebase"),
1052-
_("please commit or stash them."), 1, 0);
1052+
_("Please commit or stash them."), 1, 0);
10531053

10541054
if (get_rebase_fork_point(&rebase_fork_point, repo, *refspecs))
10551055
oidclr(&rebase_fork_point);

sequencer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3626,13 +3626,13 @@ static int do_exec(struct repository *r, const char *command_line)
36263626
"\n"),
36273627
command_line,
36283628
dirty ? _("and made changes to the index and/or the "
3629-
"working tree\n") : "");
3629+
"working tree.\n") : "");
36303630
if (status == 127)
36313631
/* command not found */
36323632
status = 1;
36333633
} else if (dirty) {
36343634
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"
36363636
"Commit or stash your changes, and then run\n"
36373637
"\n"
36383638
" git rebase --continue\n"

0 commit comments

Comments
 (0)