kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Ævar Arnfjörð Bjarmason 2011-02-22 23:42:22 +00:00 committed by Junio C Hamano
parent 2da57add28
commit a66f9b2afd
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/clean.c
View File

@ -77,9 +77,14 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (ignored && ignored_only) if (ignored && ignored_only)
die(_("-x and -X cannot be used together")); die(_("-x and -X cannot be used together"));


if (!show_only && !force) if (!show_only && !force) {
die("clean.requireForce %s to true and neither -n nor -f given; " if (config_set)
"refusing to clean", config_set ? "set" : "defaults"); 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) if (force > 1)
rm_flags = 0; rm_flags = 0;