summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2da57ad)
raw | patch | inline | side by side (parent: 2da57ad)
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Tue, 22 Feb 2011 23:42:22 +0000 (23:42 +0000) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 10 Mar 2011 07:52:57 +0000 (23:52 -0800) |
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
message to make it easier to translate.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/clean.c | patch | blob | history |
diff --git a/builtin/clean.c b/builtin/clean.c
index 2d0054be5859fbfbcdf59ad66e394430d8fe1d97..75697f711116e42df1e21e608c21829f49549b08 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;