Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
wt-status: begin error messages with lower-case
author
Johannes Schindelin
<johannes.schindelin@gmx.de>
Fri, 7 Oct 2016 16:09:04 +0000
(18:09 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 7 Oct 2016 16:29:31 +0000
(09:29 -0700)
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>
wt-status.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
d8cc92a
)
diff --git
a/wt-status.c
b/wt-status.c
index 1a270571eebd7906f3cdb07cdc0c978f2b09cd57..7dbd1e1c926b96a94cb74bd8fbbaa2171b10743f 100644
(file)
--- a/
wt-status.c
+++ b/
wt-status.c
@@
-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" */
if (has_unstaged_changes(ignore_submodules)) {
/* TRANSLATORS: the action is e.g. "pull with rebase" */
- error(_("
C
annot %s: You have unstaged changes."), _(action));
+ error(_("
c
annot %s: You have unstaged changes."), _(action));
err = 1;
}
if (has_uncommitted_changes(ignore_submodules)) {
if (err)
err = 1;
}
if (has_uncommitted_changes(ignore_submodules)) {
if (err)
- error(_("
A
dditionally, your index contains uncommitted changes."));
+ error(_("
a
dditionally, your index contains uncommitted changes."));
else
else
- error(_("
C
annot %s: Your index contains uncommitted changes."),
+ error(_("
c
annot %s: Your index contains uncommitted changes."),
_(action));
err = 1;
}
_(action));
err = 1;
}