Change fetch_pack() and friends to take string_list arguments

diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index f9463deec2f5a5875ee9870e67c990a2fea942db..83382c1fe13e1f99aad4736993c08877c989a748 100644 (file)
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -4,7 +4,7 @@
 #include "parse-options.h"
 
 static const char * const prune_packed_usage[] = {
-       "git prune-packed [-n|--dry-run] [-q|--quiet]",
+       N_("git prune-packed [-n|--dry-run] [-q|--quiet]"),
        NULL
 };
 
@@ -35,8 +35,6 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
                        unlink_or_warn(pathname);
                display_progress(progress, i + 1);
        }
-       pathname[len] = 0;
-       rmdir(pathname);
 }
 
 void prune_packed_objects(int opts)
@@ -65,6 +63,8 @@ void prune_packed_objects(int opts)
                        continue;
                prune_dir(i, d, pathname, len + 3, opts);
                closedir(d);
+               pathname[len + 2] = '\0';
+               rmdir(pathname);
        }
        stop_progress(&progress);
 }
@@ -73,8 +73,8 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 {
        int opts = isatty(2) ? VERBOSE : 0;
        const struct option prune_packed_options[] = {
-               OPT_BIT('n', "dry-run", &opts, "dry run", DRY_RUN),
-               OPT_NEGBIT('q', "quiet", &opts, "be quiet", VERBOSE),
+               OPT_BIT('n', "dry-run", &opts, N_("dry run"), DRY_RUN),
+               OPT_NEGBIT('q', "quiet", &opts, N_("be quiet"), VERBOSE),
                OPT_END()
        };