[PATCH] Call prune-packed from "git prune" as well.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:04
Subsystem:
the rest · Maintainer:
Linus Torvalds
Add -n (dryrun) flag to git-prune-packed, and call it from "git prune". Signed-off-by: Junio C Hamano <redacted> --- git-prune-script | 6 ++++-- prune-packed.c | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) 51890a64eb152fb914d0dd3676f549ab8d8cc49a
diff --git a/git-prune-script b/git-prune-script
--- a/git-prune-script
+++ b/git-prune-script@@ -3,10 +3,11 @@ . git-sh-setup-script || die "Not a git archive" dryrun= +echo= while case "$#" in 0) break ;; esac do case "$1" in - -n) dryrun=echo ;; + -n) dryrun=-n echo=echo ;; --) break ;; -*) echo >&2 "usage: git-prune-script [ -n ] [ heads... ]"; exit 1 ;; *) break ;;
@@ -20,6 +21,7 @@ sed -ne '/unreachable /{ s|\(..\)|\1/|p }' | { cd "$GIT_OBJECT_DIRECTORY" || exit - xargs $dryrun rm -f + xargs $echo rm -f } +git-prune-packed $dryrun
diff --git a/prune-packed.c b/prune-packed.c
--- a/prune-packed.c
+++ b/prune-packed.c@@ -1,6 +1,9 @@ #include "cache.h" -static const char prune_packed_usage[] = "git-prune-packed (no arguments)"; +static const char prune_packed_usage[] = +"git-prune-packed [-n]"; + +static int dryrun; static void prune_dir(int i, DIR *dir, char *pathname, int len) {
@@ -18,7 +21,9 @@ static void prune_dir(int i, DIR *dir, c if (!has_sha1_pack(sha1)) continue; memcpy(pathname + len, de->d_name, 38); - if (unlink(pathname) < 0) + if (dryrun) + printf("rm -f %s\n", pathname); + else if (unlink(pathname) < 0) error("unable to unlink %s", pathname); } }
@@ -55,8 +60,11 @@ int main(int argc, char **argv) const char *arg = argv[i]; if (*arg == '-') { - /* Handle flags here .. */ - usage(prune_packed_usage); + if (!strcmp(arg, "-n")) + dryrun = 1; + else + usage(prune_packed_usage); + continue; } /* Handle arguments here .. */ usage(prune_packed_usage);