summaryrefslogtreecommitdiff
path: root/pack-write.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2021-09-08 01:08:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-08 05:04:03 (GMT)
commit8fe8bae9d28e2b02ceb482ab89ea88bb20556f1d (patch)
treebfc00915ffb921352658d2ac9312a9d695bfcac5 /pack-write.c
parentebf3c04b262aa27fbb97f8a0156c2347fecafafb (diff)
downloadgit-8fe8bae9d28e2b02ceb482ab89ea88bb20556f1d.zip
git-8fe8bae9d28e2b02ceb482ab89ea88bb20556f1d.tar.gz
git-8fe8bae9d28e2b02ceb482ab89ea88bb20556f1d.tar.bz2
pack-write: skip *.rev work when not writing *.rev
Fix a performance regression introduced in a587b5a786 (pack-write.c: extract 'write_rev_file_order', 2021-03-30) and stop needlessly allocating the "pack_order" array and sorting it with "pack_order_cmp()", only to throw that work away when we discover that we're not writing *.rev files after all. This redundant work was not present in the original version of this code added in 8ef50d9958 (pack-write.c: prepare to write 'pack-*.rev' files, 2021-01-25). There we'd call write_rev_file() from e.g. finish_tmp_packfile(), but we'd "return NULL" early in write_rev_file() if not doing a "WRITE_REV" or "WRITE_REV_VERIFY". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-write.c')
-rw-r--r--pack-write.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/pack-write.c b/pack-write.c
index f1fc3ec..1883848 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -224,6 +224,9 @@ const char *write_rev_file(const char *rev_name,
uint32_t i;
const char *ret;
+ if (!(flags & WRITE_REV) && !(flags & WRITE_REV_VERIFY))
+ return NULL;
+
ALLOC_ARRAY(pack_order, nr_objects);
for (i = 0; i < nr_objects; i++)
pack_order[i] = i;