X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-prune-packed.c;h=24e3b0a8c21b43e0e82e5e505353213ca79f01b0;hb=eb153837d8509fc6ef59b17630429c63c0993b2d;hp=d0ff336c1479a772f9658ccc52d561469116707d;hpb=53bb2c002a53cdd0746444defbf5323ea21eb8d5;p=git.git

diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index d0ff336c1..24e3b0a8c 100644
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -1,11 +1,10 @@
+#include "builtin.h"
 #include "cache.h"
 
 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, int dryrun)
 {
 	struct dirent *de;
 	char hex[40];
@@ -18,7 +17,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len)
 		memcpy(hex+2, de->d_name, 38);
 		if (get_sha1_hex(hex, sha1))
 			continue;
-		if (!has_sha1_pack(sha1))
+		if (!has_sha1_pack(sha1, NULL))
 			continue;
 		memcpy(pathname + len, de->d_name, 38);
 		if (dryrun)
@@ -30,7 +29,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len)
 	rmdir(pathname);
 }
 
-static void prune_packed_objects(void)
+void prune_packed_objects(int dryrun)
 {
 	int i;
 	static char pathname[PATH_MAX];
@@ -49,14 +48,15 @@ static void prune_packed_objects(void)
 		d = opendir(pathname);
 		if (!d)
 			continue;
-		prune_dir(i, d, pathname, len + 3);
+		prune_dir(i, d, pathname, len + 3, dryrun);
 		closedir(d);
 	}
 }
 
-int cmd_prune_packed(int argc, char **argv, const char *prefix)
+int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 {
 	int i;
+	int dryrun = 0;
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
@@ -72,6 +72,6 @@ int cmd_prune_packed(int argc, char **argv, const char *prefix)
 		usage(prune_packed_usage);
 	}
 	sync();
-	prune_packed_objects();
+	prune_packed_objects(dryrun);
 	return 0;
 }