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

Make prune also run prune-packed

Browse Source 
Both the git-prune manpage and everday.txt say that git-prune should also prune
unpacked objects that are also found in packs, by running git prune-packed.

Junio thought this was "a regression when prune was rewritten as a built-in."

So modify prune to call prune-packed again.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
J. Bruce Fields 2006-10-22 19:01:23 -04:00 committed by Junio C Hamano
parent 474a90fef9
commit 2eb53e65bd
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin-prune-packed.c
View File

@ -4,9 +4,7 @@
static const char prune_packed_usage[] = static const char prune_packed_usage[] =
"git-prune-packed [-n]"; "git-prune-packed [-n]";
static int dryrun; static void prune_dir(int i, DIR *dir, char *pathname, int len, int dryrun)
static void prune_dir(int i, DIR *dir, char *pathname, int len)
{ {
struct dirent *de; struct dirent *de;
char hex[40]; char hex[40];
@ -31,7 +29,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len)
rmdir(pathname); rmdir(pathname);
} }
static void prune_packed_objects(void) void prune_packed_objects(int dryrun)
{ {
int i; int i;
static char pathname[PATH_MAX]; static char pathname[PATH_MAX];
@ -50,7 +48,7 @@ static void prune_packed_objects(void)
d = opendir(pathname); d = opendir(pathname);
if (!d) if (!d)
continue; continue;
prune_dir(i, d, pathname, len + 3); prune_dir(i, d, pathname, len + 3, dryrun);
closedir(d); closedir(d);
} }
} }
@ -58,6 +56,7 @@ static void prune_packed_objects(void)
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 i; int i;
int dryrun;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
const char *arg = argv[i]; const char *arg = argv[i];
@ -73,6 +72,6 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)
usage(prune_packed_usage); usage(prune_packed_usage);
} }
sync(); sync();
prune_packed_objects(); prune_packed_objects(dryrun);
return 0; return 0;
} }

2
builtin-prune.c
View File

@ -255,5 +255,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
prune_object_dir(get_object_directory()); prune_object_dir(get_object_directory());
sync();
prune_packed_objects(show_only);
return 0; return 0;
} }

1
builtin.h
View File

@ -11,6 +11,7 @@ extern int mailinfo(FILE *in, FILE *out, int ks, const char *encoding, const cha
extern int split_mbox(const char **mbox, const char *dir, int allow_bare, int nr_prec, int skip); extern int split_mbox(const char **mbox, const char *dir, int allow_bare, int nr_prec, int skip);
extern void stripspace(FILE *in, FILE *out); extern void stripspace(FILE *in, FILE *out);
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix); extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
extern void prune_packed_objects(int);
extern int cmd_add(int argc, const char **argv, const char *prefix); extern int cmd_add(int argc, const char **argv, const char *prefix);
extern int cmd_apply(int argc, const char **argv, const char *prefix); extern int cmd_apply(int argc, const char **argv, const char *prefix);