mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make git-pack-redundant take a list of unimportant objs on stdin

Browse Source 
This lets us do "git-fsck-objects --full --unreachable | cut -d ' ' -f3 |
git-pack-redundant --all", which will keep git-pack-redundant from keeping
packs just because they contain unreachable objects.

Also add some more --verbose output.

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Lukas Sandström
2005-11-18 23:17:50 +01:00
committed by Junio C Hamano
parent 302ebfe521
commit bb931cf9d7
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pack-redundant.c
View File

@ -579,6 +579,8 @@ int main(int argc, char **argv)
{ {
int i; int i;
struct pack_list *min, *red, *pl; struct pack_list *min, *red, *pl;
struct llist *ignore;
char *sha1, buf[42]; /* 40 byte sha1 + \n + \0 */
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
const char *arg = argv[i]; const char *arg = argv[i];
@ -621,6 +623,23 @@ int main(int argc, char **argv)
if (alt_odb) if (alt_odb)
scan_alt_odb_packs(); scan_alt_odb_packs();
/* ignore objects given on stdin */
llist_init(&ignore);
if (!isatty(0)) {
while (fgets(buf, sizeof(buf), stdin)) {
sha1 = xmalloc(20);
if (get_sha1_hex(buf, sha1))
die("Bad sha1 on stdin: %s", buf);
llist_insert_sorted_unique(ignore, sha1, NULL);
}
}
llist_sorted_difference_inplace(all_objects, ignore);
pl = local_packs;
while (pl) {
llist_sorted_difference_inplace(pl->unique_objects, ignore);
pl = pl->next;
}
minimize(&min); minimize(&min);
if (verbose) { if (verbose) {
@ -647,6 +666,8 @@ int main(int argc, char **argv)
pl->pack->pack_name); pl->pack->pack_name);
pl = pl->next; pl = pl->next;
} }
if (verbose)
fprintf(stderr, "%luMB of redundant packs in total.\n", pack_set_bytecount(red)/(1024*1024));
return 0; return 0;
} }