summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d029d68)
raw | patch | inline | side by side (parent: d029d68)
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sun, 5 Sep 2010 12:34:17 +0000 (12:34 +0000) | ||
committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sat, 30 Oct 2010 07:58:13 +0000 (07:58 +0000) |
Split up the "clean.requireForce set/defaults to true..." die()
message to make it easier to translate.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
message to make it easier to translate.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
builtin/clean.c | patch | blob | history |
diff --git a/builtin/clean.c b/builtin/clean.c
index fec3d72262cc34b646c43a515c01e92db8b2be32..52ec17a8345d815eaf8295bc702bbec75dba4cde 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
if (ignored && ignored_only)
die(_("-x and -X cannot be used together"));
- if (!show_only && !force)
- die("clean.requireForce %s to true and neither -n nor -f given; "
- "refusing to clean", config_set ? "set" : "defaults");
+ if (!show_only && !force) {
+ if (config_set)
+ die(_("clean.requireForce set to true and neither -n nor -f given; "
+ "refusing to clean"));
+ else
+ die(_("clean.requireForce defaults to true and neither -n nor -f given; "
+ "refusing to clean"));
+ }
if (force > 1)
rm_flags = 0;