Call prune-packed from "git prune" as well.

Add -n (dryrun) flag to git-prune-packed, and call it from "git prune".

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-prune-script b/git-prune-script
index a8e338c488865b1579071ea363fc18fa8e3d8890..2e130c7f9698729f471edbdfdf9a3cce63c56ddd 100755 (executable)
--- a/git-prune-script
+++ b/git-prune-script
@@ -3,10 +3,11 @@
 . git-sh-setup-script || die "Not a git archive"
 
 dryrun=
 . git-sh-setup-script || die "Not a git archive"
 
 dryrun=

+echo=

 while case "$#" in 0) break ;; esac
 do
     case "$1" in
 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 ;;
     --) 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
     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
index a2f448830c8c89cd19f82f2ec215ad349583777e..5306e8e5ef411bfa7e6bcf4ba0639e640592818b 100644 (file)
--- a/prune-packed.c
+++ b/prune-packed.c
@@ -1,6 +1,9 @@
 #include "cache.h"
 
 #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)
 {
 
 static void prune_dir(int i, DIR *dir, char *pathname, int len)
 {


@@ -18,7 +21,9 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len)
                if (!has_sha1_pack(sha1))
                        continue;
                memcpy(pathname + len, de->d_name, 38);
                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);
        }
 }
                        error("unable to unlink %s", pathname);
        }
 }


@@ -55,8 +60,11 @@ int main(int argc, char **argv)
                const char *arg = argv[i];
 
                if (*arg == '-') {
                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);
                }
                /* Handle arguments here .. */
                usage(prune_packed_usage);