summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2019-04-05 14:14:00 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-16 16:58:21 +0900
commit79bb8b3c80b902f43d2bc7cdf3afa2ffc2668c32 (patch)
tree7260ea5897976f4962deb376fda3478cff7d7744 /builtin/merge-ours.c
parentserver-info: use strbuf to read old info/packs file (diff)
downloadtgif-79bb8b3c80b902f43d2bc7cdf3afa2ffc2668c32.tar.xz
server-info: drop nr_alloc struct member
We keep an array of struct pointers, with each one representing a single packfile. But for some reason there is a nr_alloc parameter inside each struct, which has never been used. This is probably cruft left over from development, where we might have wanted a nr_alloc to dynamically grow the list. But as it turns out, we do not dynamically grow the list at all, but rather count up the total number of packs and use that as a maximum size. So while we're thinking of this, let's add an assert() that documents (and checks!) that our allocation and fill loops stay in sync. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions