Commit b60daf0 (Make git-prune-packed a bit more chatty. - 2007-01-12)
changes the meaning of prune_packed_objects()'s argument, from "dry
run or not dry run" to a bitmap.
It however forgot to update prune_packed_objects() caller in
builtin/prune.c to use new DRY_RUN macro. It's fine (for a long time!)
but there is a risk that someday someone may change the value of
DRY_RUN to something else and builtin/prune.c suddenly breaks. Avoid
that possibility.
While at there, change "opts == VERBOSE" to "opts & VERBOSE" as there
is no obvious reason why we only be chatty when DRY_RUN is not set.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
	
		
			
				
	
	
		
			86 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			86 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "builtin.h"
 | 
						|
#include "cache.h"
 | 
						|
#include "progress.h"
 | 
						|
#include "parse-options.h"
 | 
						|
 | 
						|
static const char * const prune_packed_usage[] = {
 | 
						|
	N_("git prune-packed [-n|--dry-run] [-q|--quiet]"),
 | 
						|
	NULL
 | 
						|
};
 | 
						|
 | 
						|
static struct progress *progress;
 | 
						|
 | 
						|
static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
 | 
						|
{
 | 
						|
	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 (opts & PRUNE_PACKED_DRY_RUN)
 | 
						|
			printf("rm -f %s\n", pathname);
 | 
						|
		else
 | 
						|
			unlink_or_warn(pathname);
 | 
						|
		display_progress(progress, i + 1);
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
void prune_packed_objects(int opts)
 | 
						|
{
 | 
						|
	int i;
 | 
						|
	static char pathname[PATH_MAX];
 | 
						|
	const char *dir = get_object_directory();
 | 
						|
	int len = strlen(dir);
 | 
						|
 | 
						|
	if (opts & PRUNE_PACKED_VERBOSE)
 | 
						|
		progress = start_progress_delay("Removing duplicate objects",
 | 
						|
			256, 95, 2);
 | 
						|
 | 
						|
	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;
 | 
						|
 | 
						|
		display_progress(progress, i + 1);
 | 
						|
		sprintf(pathname + len, "%02x/", i);
 | 
						|
		d = opendir(pathname);
 | 
						|
		if (!d)
 | 
						|
			continue;
 | 
						|
		prune_dir(i, d, pathname, len + 3, opts);
 | 
						|
		closedir(d);
 | 
						|
		pathname[len + 2] = '\0';
 | 
						|
		rmdir(pathname);
 | 
						|
	}
 | 
						|
	stop_progress(&progress);
 | 
						|
}
 | 
						|
 | 
						|
int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 | 
						|
{
 | 
						|
	int opts = isatty(2) ? PRUNE_PACKED_VERBOSE : 0;
 | 
						|
	const struct option prune_packed_options[] = {
 | 
						|
		OPT_BIT('n', "dry-run", &opts, N_("dry run"),
 | 
						|
			PRUNE_PACKED_DRY_RUN),
 | 
						|
		OPT_NEGBIT('q', "quiet", &opts, N_("be quiet"),
 | 
						|
			   PRUNE_PACKED_VERBOSE),
 | 
						|
		OPT_END()
 | 
						|
	};
 | 
						|
 | 
						|
	argc = parse_options(argc, argv, prefix, prune_packed_options,
 | 
						|
			     prune_packed_usage, 0);
 | 
						|
 | 
						|
	prune_packed_objects(opts);
 | 
						|
	return 0;
 | 
						|
}
 |