From: Ævar Arnfjörð Bjarmason Date: Sun, 5 Sep 2010 12:34:17 +0000 (+0000) Subject: gettextize: git-clean clean.requireForce messages X-Git-Tag: ko-pu~10^2~79 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fb41e878511f5c9f5b8f946ce343d1c7b1c9a488;p=git.git gettextize: git-clean clean.requireForce messages Split up the "clean.requireForce set/defaults to true..." die() message to make it easier to translate. Signed-off-by: Ævar Arnfjörð Bjarmason --- diff --git a/builtin/clean.c b/builtin/clean.c index fec3d7226..52ec17a83 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -77,9 +77,14 @@ int cmd_clean(int argc, const char **argv, const char *prefix) 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;