diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | builtin-pack-redundant.c (renamed from pack-redundant.c) | 8 | ||||
| -rw-r--r-- | builtin.h | 1 | ||||
| -rw-r--r-- | git.c | 1 |
4 files changed, 5 insertions, 7 deletions
@@ -389,7 +389,6 @@ PROGRAMS += $(EXTRA_PROGRAMS) PROGRAMS += git-fast-import$X PROGRAMS += git-imap-send$X PROGRAMS += git-index-pack$X -PROGRAMS += git-pack-redundant$X PROGRAMS += git-shell$X PROGRAMS += git-show-index$X PROGRAMS += git-upload-pack$X @@ -673,6 +672,7 @@ BUILTIN_OBJS += builtin-mktree.o BUILTIN_OBJS += builtin-mv.o BUILTIN_OBJS += builtin-name-rev.o BUILTIN_OBJS += builtin-pack-objects.o +BUILTIN_OBJS += builtin-pack-redundant.o BUILTIN_OBJS += builtin-pack-refs.o BUILTIN_OBJS += builtin-patch-id.o BUILTIN_OBJS += builtin-prune-packed.o diff --git a/pack-redundant.c b/builtin-pack-redundant.c index 21c61dbbe..41e1615a2 100644 --- a/pack-redundant.c +++ b/builtin-pack-redundant.c @@ -568,7 +568,7 @@ static struct pack_list * add_pack(struct packed_git *p) return pack_list_insert(&altodb_packs, &l); } -static struct pack_list * add_pack_file(char *filename) +static struct pack_list * add_pack_file(const char *filename) { struct packed_git *p = packed_git; @@ -593,7 +593,7 @@ static void load_all(void) } } -int main(int argc, char **argv) +int cmd_pack_redundant(int argc, const char **argv, const char *prefix) { int i; struct pack_list *min, *red, *pl; @@ -601,13 +601,9 @@ int main(int argc, char **argv) unsigned char *sha1; char buf[42]; /* 40 byte sha1 + \n + \0 */ - git_extract_argv0_path(argv[0]); - if (argc == 2 && !strcmp(argv[1], "-h")) usage(pack_redundant_usage); - setup_git_directory(); - for (i = 1; i < argc; i++) { const char *arg = argv[i]; if (!strcmp(arg, "--")) { @@ -78,6 +78,7 @@ extern int cmd_mktree(int argc, const char **argv, const char *prefix); extern int cmd_mv(int argc, const char **argv, const char *prefix); extern int cmd_name_rev(int argc, const char **argv, const char *prefix); extern int cmd_pack_objects(int argc, const char **argv, const char *prefix); +extern int cmd_pack_redundant(int argc, const char **argv, const char *prefix); extern int cmd_patch_id(int argc, const char **argv, const char *prefix); extern int cmd_pickaxe(int argc, const char **argv, const char *prefix); extern int cmd_prune(int argc, const char **argv, const char *prefix); @@ -343,6 +343,7 @@ static void handle_internal_command(int argc, const char **argv) { "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE }, { "name-rev", cmd_name_rev, RUN_SETUP }, { "pack-objects", cmd_pack_objects, RUN_SETUP }, + { "pack-redundant", cmd_pack_redundant, RUN_SETUP }, { "patch-id", cmd_patch_id }, { "peek-remote", cmd_ls_remote }, { "pickaxe", cmd_blame, RUN_SETUP }, |