1
0
mirror of https://github.com/git/git synced 2024-07-02 15:48:44 +00:00

wt-status: begin error messages with lower-case

The previous code still followed the old git-pull.sh code which did not
adhere to our new convention.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2016-10-07 18:09:04 +02:00 committed by Junio C Hamano
parent d8cc92ab13
commit 4777e175de

View File

@ -2265,15 +2265,15 @@ int require_clean_work_tree(const char *action, const char *hint, int ignore_sub
if (has_unstaged_changes(ignore_submodules)) {
/* TRANSLATORS: the action is e.g. "pull with rebase" */
error(_("Cannot %s: You have unstaged changes."), _(action));
error(_("cannot %s: You have unstaged changes."), _(action));
err = 1;
}
if (has_uncommitted_changes(ignore_submodules)) {
if (err)
error(_("Additionally, your index contains uncommitted changes."));
error(_("additionally, your index contains uncommitted changes."));
else
error(_("Cannot %s: Your index contains uncommitted changes."),
error(_("cannot %s: Your index contains uncommitted changes."),
_(action));
err = 1;
}