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

Merge branch 'jk/prune-packed-server-info'

Browse Source 
Code cleanup.

* jk/prune-packed-server-info:
  repack: call prune_packed_objects() and update_server_info() directly
  server-info: clean up after writing info/packs
  make update-server-info more robust
  prune-packed: fix minor memory leak
This commit is contained in:
Junio C Hamano
2014-09-26 14:39:44 -07:00
parent f190737f22 4489a480fd
commit c0f5f311db
3 changed files with 86 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
builtin/repack.c
View File

@ -377,6 +377,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;
@ -387,25 +388,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);