Skip to content

Commit

Permalink
wt-status: begin error messages with lower-case
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dscho committed Oct 4, 2016
1 parent 3825aa3 commit 1d26392
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion builtin/pull.c
Expand Up @@ -810,7 +810,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)

if (!autostash)
require_clean_work_tree(N_("pull with rebase"),
"Please commit or stash them.", 1, 0);
"please commit or stash them.", 1, 0);

if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs))
hashclr(rebase_fork_point);
Expand Down
6 changes: 3 additions & 3 deletions wt-status.c
Expand Up @@ -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;
}
Expand Down

0 comments on commit 1d26392

Please sign in to comment.