Skip to content
Open
Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions builtin/pack-objects.c
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,7 @@ static void write_pack_file(void)
uint32_t nr_remaining = nr_result;
time_t last_mtime = 0;
struct object_entry **write_order;
off_t bytes_written = 0;

if (progress > pack_to_stdout)
progress_state = start_progress(the_repository,
Expand All @@ -1347,6 +1348,7 @@ static void write_pack_file(void)
do {
unsigned char hash[GIT_MAX_RAWSZ];
char *pack_tmp_name = NULL;
off_t pack_bytes;

if (pack_to_stdout) {
/*
Expand Down Expand Up @@ -1389,6 +1391,8 @@ static void write_pack_file(void)
display_progress(progress_state, written);
}

pack_bytes = hashfile_total(f) +
the_repository->hash_algo->rawsz;
if (pack_to_stdout) {
/*
* We never fsync when writing to stdout since we may
Expand Down Expand Up @@ -1419,6 +1423,7 @@ static void write_pack_file(void)
write_bitmap_index = 0;
}
}
bytes_written += pack_bytes;

if (!pack_to_stdout) {
struct stat st;
Expand Down Expand Up @@ -1510,6 +1515,8 @@ static void write_pack_file(void)
written, nr_result);
trace2_data_intmax("pack-objects", the_repository,
"write_pack_file/wrote", nr_result);
trace2_data_intmax("pack-objects", the_repository,
"write_pack_file/wrote_bytes", bytes_written);
}

static int no_try_delta(const char *path)
Expand Down
24 changes: 24 additions & 0 deletions t/t5300-pack-object.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,30 @@ test_expect_success 'setup' '
} >expect
'

test_expect_success 'pack-object traces bytes written to stdout' '
test_when_finished "rm -f pack.trace pack.pack" &&
GIT_TRACE2_EVENT="$PWD/pack.trace" \
git pack-objects --quiet --revs --stdout >pack.pack <<-EOF &&
$commit
EOF
bytes=$(test_file_size pack.pack) &&
test_grep "\"key\":\"write_pack_file/wrote_bytes\",\"value\":\"$bytes\"" pack.trace
'

test_expect_success 'pack-object traces bytes written to split pack files' '
test_when_finished "rm -f split.trace traced-pack-*" &&
GIT_TRACE2_EVENT="$PWD/split.trace" \
git -c pack.packSizeLimit=3m pack-objects --quiet traced-pack <obj-list &&
test 2 = $(ls traced-pack-*.pack | wc -l) &&
bytes=0 &&
for pack in traced-pack-*.pack
do
pack_size=$(test_file_size "$pack") &&
bytes=$((bytes + pack_size)) || return 1
done &&
test_grep "\"key\":\"write_pack_file/wrote_bytes\",\"value\":\"$bytes\"" split.trace
'

test_expect_success 'setup pack-object <stdin' '
git init pack-object-stdin &&
test_commit -C pack-object-stdin one &&
Expand Down
Loading