undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/prune-packed-dryrun-verbose'

Browse Source 
* nd/prune-packed-dryrun-verbose:
  prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()
This commit is contained in:
Junio C Hamano 2013-06-06 12:17:52 -07:00
commit 9d54f97e34
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin.h
View File

@ -12,6 +12,9 @@
extern const char git_usage_string[]; extern const char git_usage_string[];
extern const char git_more_info_string[]; extern const char git_more_info_string[];
#define PRUNE_PACKED_DRY_RUN 01
#define PRUNE_PACKED_VERBOSE 02
extern void prune_packed_objects(int); extern void prune_packed_objects(int);
struct fmt_merge_msg_opts { struct fmt_merge_msg_opts {

15
builtin/prune-packed.c
View File

@ -8,9 +8,6 @@ static const char * const prune_packed_usage[] = {
NULL NULL
}; };
#define DRY_RUN 01
#define VERBOSE 02
static struct progress *progress; static struct progress *progress;
static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts) static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
@ -29,7 +26,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
if (!has_sha1_pack(sha1)) if (!has_sha1_pack(sha1))
continue; continue;
memcpy(pathname + len, de->d_name, 38); memcpy(pathname + len, de->d_name, 38);
if (opts & DRY_RUN) if (opts & PRUNE_PACKED_DRY_RUN)
printf("rm -f %s\n", pathname); printf("rm -f %s\n", pathname);
else else
unlink_or_warn(pathname); unlink_or_warn(pathname);
@ -44,7 +41,7 @@ void prune_packed_objects(int opts)
const char *dir = get_object_directory(); const char *dir = get_object_directory();
int len = strlen(dir); int len = strlen(dir);
if (opts == VERBOSE) if (opts & PRUNE_PACKED_VERBOSE)
progress = start_progress_delay("Removing duplicate objects", progress = start_progress_delay("Removing duplicate objects",
256, 95, 2); 256, 95, 2);
@ -71,10 +68,12 @@ void prune_packed_objects(int opts)
int cmd_prune_packed(int argc, const char **argv, const char *prefix) int cmd_prune_packed(int argc, const char **argv, const char *prefix)
{ {
int opts = isatty(2) ? VERBOSE : 0; int opts = isatty(2) ? PRUNE_PACKED_VERBOSE : 0;
const struct option prune_packed_options[] = { const struct option prune_packed_options[] = {
OPT_BIT('n', "dry-run", &opts, N_("dry run"), DRY_RUN), OPT_BIT('n', "dry-run", &opts, N_("dry run"),
OPT_NEGBIT('q', "quiet", &opts, N_("be quiet"), VERBOSE), PRUNE_PACKED_DRY_RUN),
OPT_NEGBIT('q', "quiet", &opts, N_("be quiet"),
PRUNE_PACKED_VERBOSE),
OPT_END() OPT_END()
}; };

2
builtin/prune.c
View File

@ -165,7 +165,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
stop_progress(&progress); stop_progress(&progress);
prune_object_dir(get_object_directory()); prune_object_dir(get_object_directory());
prune_packed_objects(show_only); prune_packed_objects(show_only ? PRUNE_PACKED_DRY_RUN : 0);
remove_temporary_files(get_object_directory()); remove_temporary_files(get_object_directory());
s = mkpathdup("%s/pack", get_object_directory()); s = mkpathdup("%s/pack", get_object_directory());
remove_temporary_files(s); remove_temporary_files(s);