Skip to content

Commit 4489a48

Browse files
rscharfegitster
authored andcommitted
repack: call prune_packed_objects() and update_server_info() directly
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>
1 parent 3907a40 commit 4489a48

1 file changed

Lines changed: 6 additions & 17 deletions

File tree

builtin/repack.c

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
378378
/* End of pack replacement. */
379379

380380
if (delete_redundant) {
381+
int opts = 0;
381382
sort_string_list(&names);
382383
for_each_string_list_item(item, &existing_packs) {
383384
char *sha1;
@@ -388,25 +389,13 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
388389
if (!string_list_has_string(&names, sha1))
389390
remove_redundant_pack(packdir, item->string);
390391
}
391-
argv_array_push(&cmd_args, "prune-packed");
392-
if (quiet)
393-
argv_array_push(&cmd_args, "--quiet");
394-
395-
memset(&cmd, 0, sizeof(cmd));
396-
cmd.argv = cmd_args.argv;
397-
cmd.git_cmd = 1;
398-
run_command(&cmd);
399-
argv_array_clear(&cmd_args);
392+
if (!quiet && isatty(2))
393+
opts |= PRUNE_PACKED_VERBOSE;
394+
prune_packed_objects(opts);
400395
}
401396

402-
if (!no_update_server_info) {
403-
argv_array_push(&cmd_args, "update-server-info");
404-
memset(&cmd, 0, sizeof(cmd));
405-
cmd.argv = cmd_args.argv;
406-
cmd.git_cmd = 1;
407-
run_command(&cmd);
408-
argv_array_clear(&cmd_args);
409-
}
397+
if (!no_update_server_info)
398+
update_server_info(0);
410399
remove_temporary_files();
411400
string_list_clear(&names, 0);
412401
string_list_clear(&rollback, 0);

0 commit comments

Comments
 (0)