diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:42:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:57 -0800 |
| commit | a66f9b2afde8ae0d6bd8991e6a8f848904c8bdde (patch) | |
| tree | 82d585b68b6531ed1f9b9d9902bfaec63467ca74 /builtin/clean.c | |
| parent | 2da57add287c9a5b26e348c35947d6de369e77da (diff) | |
| download | git-a66f9b2afde8ae0d6bd8991e6a8f848904c8bdde.tar.gz | |
i18n: 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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/clean.c')
| -rw-r--r-- | builtin/clean.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 2d0054be58..75697f7111 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; |