Andrew's git / gitweb.git / blobdiff
?
cmd_fetch_pack(): return early if finish_connect() fails
[gitweb.git] / builtin / prune.c
diff --git a/builtin/prune.c b/builtin/prune.c
index 58d7cb83240ecef7ab3ff82f3aa92959ec7a62fe..9a03d24dadaaba8bc1fc0c778dbfe33b1651607e 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -9,7 +9,7 @@
 #include "dir.h"
 
 static const char * const prune_usage[] = {
-       "git prune [-n] [-v] [--expire <time>] [--] [<head>...]",
+       N_("git prune [-n] [-v] [--expire <time>] [--] [<head>...]"),
        NULL
 };
 static int show_only;
@@ -25,7 +25,8 @@ static int prune_tmp_object(const char *path, const char *filename)
                return error("Could not stat '%s'", fullpath);
        if (st.st_mtime > expire)
                return 0;
-       printf("Removing stale temporary file %s\n", fullpath);
+       if (show_only || verbose)
+               printf("Removing stale temporary file %s\n", fullpath);
        if (!show_only)
                unlink_or_warn(fullpath);
        return 0;
@@ -85,9 +86,9 @@ static int prune_dir(int i, char *path)
                }
                fprintf(stderr, "bad sha1 file: %s/%s\n", path, de->d_name);
        }
+       closedir(dir);
        if (!show_only)
                rmdir(path);
-       closedir(dir);
        return 0;
 }
 
@@ -128,11 +129,11 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
        struct rev_info revs;
        struct progress *progress = NULL;
        const struct option options[] = {
-               OPT__DRY_RUN(&show_only, "do not remove, show only"),
-               OPT__VERBOSE(&verbose, "report pruned objects"),
-               OPT_BOOL(0, "progress", &show_progress, "show progress"),
+               OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
+               OPT__VERBOSE(&verbose, N_("report pruned objects")),
+               OPT_BOOL(0, "progress", &show_progress, N_("show progress")),
                OPT_DATE(0, "expire", &expire,
-                        "expire objects older than <time>"),
+                        N_("expire objects older than <time>")),
                OPT_END()
        };
        char *s;