Skip to content

Commit

Permalink
repack: call prune_packed_objects() and update_server_info() directly
Browse files Browse the repository at this point in the history
Call the functions behind git prune-packed and git update-server-info
directly instead of using run_command().  This is shorter, easier and
quicker.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
René Scharfe authored and Junio C Hamano committed Sep 15, 2014
1 parent 3907a40 commit 4489a48
Showing 1 changed file with 6 additions and 17 deletions.
23 changes: 6 additions & 17 deletions builtin/repack.c
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
/* End of pack replacement. */

if (delete_redundant) {
int opts = 0;
sort_string_list(&names);
for_each_string_list_item(item, &existing_packs) {
char *sha1;
Expand All @@ -388,25 +389,13 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
if (!string_list_has_string(&names, sha1))
remove_redundant_pack(packdir, item->string);
}
argv_array_push(&cmd_args, "prune-packed");
if (quiet)
argv_array_push(&cmd_args, "--quiet");

memset(&cmd, 0, sizeof(cmd));
cmd.argv = cmd_args.argv;
cmd.git_cmd = 1;
run_command(&cmd);
argv_array_clear(&cmd_args);
if (!quiet && isatty(2))
opts |= PRUNE_PACKED_VERBOSE;
prune_packed_objects(opts);
}

if (!no_update_server_info) {
argv_array_push(&cmd_args, "update-server-info");
memset(&cmd, 0, sizeof(cmd));
cmd.argv = cmd_args.argv;
cmd.git_cmd = 1;
run_command(&cmd);
argv_array_clear(&cmd_args);
}
if (!no_update_server_info)
update_server_info(0);
remove_temporary_files();
string_list_clear(&names, 0);
string_list_clear(&rollback, 0);
Expand Down

0 comments on commit 4489a48

Please sign in to comment.