[PATCH v4 63/73] gettextize: git-clean clean.requireForce messages
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Feb 22, 2011, 23:42 UTC
- Message-ID
- <1298418152-27789-64-git-send-email-avarab@gmail.com>
- In-Reply-To
- <7vhbbwdjnm.fsf@alter.siamese.dyndns.org>
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> --- builtin/clean.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c index 2d0054b..75697f7 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;
-- 1.7.2.3