|
|
|
@ -75,7 +75,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
@@ -75,7 +75,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
|
|
|
|
|
dir.flags |= DIR_SHOW_IGNORED; |
|
|
|
|
|
|
|
|
|
if (ignored && ignored_only) |
|
|
|
|
die("-x and -X cannot be used together"); |
|
|
|
|
die(_("-x and -X cannot be used together")); |
|
|
|
|
|
|
|
|
|
if (!show_only && !force) |
|
|
|
|
die("clean.requireForce %s to true and neither -n nor -f given; " |
|
|
|
@ -87,7 +87,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
@@ -87,7 +87,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
|
|
|
|
|
dir.flags |= DIR_SHOW_OTHER_DIRECTORIES; |
|
|
|
|
|
|
|
|
|
if (read_cache() < 0) |
|
|
|
|
die("index file corrupt"); |
|
|
|
|
die(_("index file corrupt")); |
|
|
|
|
|
|
|
|
|
if (!ignored) |
|
|
|
|
setup_standard_excludes(&dir); |
|
|
|
@ -146,20 +146,20 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
@@ -146,20 +146,20 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
|
|
|
|
|
qname = quote_path_relative(directory.buf, directory.len, &buf, prefix); |
|
|
|
|
if (show_only && (remove_directories || |
|
|
|
|
(matches == MATCHED_EXACTLY))) { |
|
|
|
|
printf("Would remove %s\n", qname); |
|
|
|
|
printf(_("Would remove %s\n"), qname); |
|
|
|
|
} else if (remove_directories || |
|
|
|
|
(matches == MATCHED_EXACTLY)) { |
|
|
|
|
if (!quiet) |
|
|
|
|
printf("Removing %s\n", qname); |
|
|
|
|
printf(_("Removing %s\n"), qname); |
|
|
|
|
if (remove_dir_recursively(&directory, |
|
|
|
|
rm_flags) != 0) { |
|
|
|
|
warning("failed to remove %s", qname); |
|
|
|
|
warning(_("failed to remove %s"), qname); |
|
|
|
|
errors++; |
|
|
|
|
} |
|
|
|
|
} else if (show_only) { |
|
|
|
|
printf("Would not remove %s\n", qname); |
|
|
|
|
printf(_("Would not remove %s\n"), qname); |
|
|
|
|
} else { |
|
|
|
|
printf("Not removing %s\n", qname); |
|
|
|
|
printf(_("Not removing %s\n"), qname); |
|
|
|
|
} |
|
|
|
|
strbuf_reset(&directory); |
|
|
|
|
} else { |
|
|
|
@ -167,13 +167,13 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
@@ -167,13 +167,13 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
|
|
|
|
|
continue; |
|
|
|
|
qname = quote_path_relative(ent->name, -1, &buf, prefix); |
|
|
|
|
if (show_only) { |
|
|
|
|
printf("Would remove %s\n", qname); |
|
|
|
|
printf(_("Would remove %s\n"), qname); |
|
|
|
|
continue; |
|
|
|
|
} else if (!quiet) { |
|
|
|
|
printf("Removing %s\n", qname); |
|
|
|
|
printf(_("Removing %s\n"), qname); |
|
|
|
|
} |
|
|
|
|
if (unlink(ent->name) != 0) { |
|
|
|
|
warning("failed to remove %s", qname); |
|
|
|
|
warning(_("failed to remove %s"), qname); |
|
|
|
|
errors++; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|