Merge branch 'ef/setenv-putenv' into maint

diff --git a/builtin/clean.c b/builtin/clean.c
index fb24030751ec5e755009a97439ffa08ff55f67d5..0c7b3d0f4c28c9e9c721c961e529196751271d11 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -48,13 +48,13 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        const char *qname;
        char *seen = NULL;
        struct option options[] = {
-               OPT__QUIET(&quiet),
-               OPT__DRY_RUN(&show_only),
-               OPT_BOOLEAN('f', "force", &force, "force"),
+               OPT__QUIET(&quiet, "do not print names of files removed"),
+               OPT__DRY_RUN(&show_only, "dry run"),
+               OPT__FORCE(&force, "force"),
                OPT_BOOLEAN('d', NULL, &remove_directories,
                                "remove whole directories"),
                { OPTION_CALLBACK, 'e', "exclude", &exclude_list, "pattern",
-                 "exclude <pattern>", PARSE_OPT_NONEG, exclude_cb },
+                 "add <pattern> to ignore rules", PARSE_OPT_NONEG, exclude_cb },
                OPT_BOOLEAN('x', NULL, &ignored, "remove ignored files, too"),
                OPT_BOOLEAN('X', NULL, &ignored_only,
                                "remove only ignored files"),
@@ -75,11 +75,16 @@ 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");
-
-       if (!show_only && !force)
-               die("clean.requireForce %s to true and neither -n nor -f given; "
-                   "refusing to clean", config_set ? "set" : "defaults");
+               die(_("-x and -X cannot be used together"));
+
+       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;
@@ -87,13 +92,14 @@ 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);
 
        for (i = 0; i < exclude_list.nr; i++)
-               add_exclude(exclude_list.items[i].string, "", 0, dir.exclude_list);
+               add_exclude(exclude_list.items[i].string, "", 0,
+                           &dir.exclude_list[EXC_CMDL]);
 
        pathspec = get_pathspec(prefix, argv);
 
@@ -146,20 +152,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 +173,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++;
                        }
                }