Merge branch 'master' into js/c-merge-recursive

Adjust to hold_lock_file_for_update() change on the master.

1 files changed, 78 insertions, 0 deletions

diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
new file mode 100644
index 0000000..d3dd94d
--- /dev/null
+++ b/builtin-prune-packed.c
@@ -0,0 +1,78 @@
+#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)
+{
+	struct dirent *de;
+	char hex[40];
+
+	sprintf(hex, "%02x", i);
+	while ((de = readdir(dir)) != NULL) {
+		unsigned char sha1[20];
+		if (strlen(de->d_name) != 38)
+			continue;
+		memcpy(hex+2, de->d_name, 38);
+		if (get_sha1_hex(hex, sha1))
+			continue;
+		if (!has_sha1_pack(sha1))
+			continue;
+		memcpy(pathname + len, de->d_name, 38);
+		if (dryrun)
+			printf("rm -f %s\n", pathname);
+		else if (unlink(pathname) < 0)
+			error("unable to unlink %s", pathname);
+	}
+	pathname[len] = 0;
+	rmdir(pathname);
+}
+
+static void prune_packed_objects(void)
+{
+	int i;
+	static char pathname[PATH_MAX];
+	const char *dir = get_object_directory();
+	int len = strlen(dir);
+
+	if (len > PATH_MAX - 42)
+		die("impossible object directory");
+	memcpy(pathname, dir, len);
+	if (len && pathname[len-1] != '/')
+		pathname[len++] = '/';
+	for (i = 0; i < 256; i++) {
+		DIR *d;
+
+		sprintf(pathname + len, "%02x/", i);
+		d = opendir(pathname);
+		if (!d)
+			continue;
+		prune_dir(i, d, pathname, len + 3);
+		closedir(d);
+	}
+}
+
+int cmd_prune_packed(int argc, const char **argv, const char *prefix)
+{
+	int i;
+
+	for (i = 1; i < argc; i++) {
+		const char *arg = argv[i];
+
+		if (*arg == '-') {
+			if (!strcmp(arg, "-n"))
+				dryrun = 1;
+			else
+				usage(prune_packed_usage);
+			continue;
+		}
+		/* Handle arguments here .. */
+		usage(prune_packed_usage);
+	}
+	sync();
+	prune_packed_objects();
+	return 0;
+}