Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion builtin/pack-objects.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "packfile.h"
#include "object-store.h"
#include "dir.h"
#include "trace2.h"

#define IN_PACK(obj) oe_in_pack(&to_pack, obj)
#define SIZE(obj) oe_size(&to_pack, obj)
Expand Down Expand Up @@ -3357,6 +3358,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
}
}

trace2_region_enter("pack-objects", "enumerate-objects", the_repository);
prepare_packing_data(&to_pack);

if (progress)
Expand All @@ -3371,12 +3373,20 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
if (include_tag && nr_result)
for_each_ref(add_ref_tag, NULL);
stop_progress(&progress_state);
trace2_region_leave("pack-objects", "enumerate-objects", the_repository);

if (non_empty && !nr_result)
return 0;
if (nr_result)
if (nr_result) {
trace2_region_enter("pack-objects", "prepare-pack", the_repository);
prepare_pack(window, depth);
trace2_region_leave("pack-objects", "prepare-pack", the_repository);
}

trace2_region_enter("pack-objects", "write-pack-file", the_repository);
write_pack_file();
trace2_region_leave("pack-objects", "write-pack-file", the_repository);

if (progress)
fprintf_ln(stderr,
_("Total %"PRIu32" (delta %"PRIu32"),"
Expand Down