diff options
author | Jeff King <peff@peff.net> | 2016-02-11 17:28:36 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-12 12:51:17 -0800 |
commit | de1e67d0703894cb6ea782e36abb63976ab07e60 (patch) | |
tree | 8229efe404fc34d5549d98e06998872919523e85 /pack-bitmap-write.c | |
parent | bd64516aca4d4e22acb33c71429d293a14d355cf (diff) | |
download | git-de1e67d0703894cb6ea782e36abb63976ab07e60.tar.gz |
list-objects: pass full pathname to callbacksjk/lose-name-path
When we find a blob at "a/b/c", we currently pass this to
our show_object_fn callbacks as two components: "a/b/" and
"c". Callbacks which want the full value then call
path_name(), which concatenates the two. But this is an
inefficient interface; the path is a strbuf, and we could
simply append "c" to it temporarily, then roll back the
length, without creating a new copy.
So we could improve this by teaching the callsites of
path_name() this trick (and there are only 3). But we can
also notice that no callback actually cares about the
broken-down representation, and simply pass each callback
the full path "a/b/c" as a string. The callback code becomes
even simpler, then, as we do not have to worry about freeing
an allocated buffer, nor rolling back our modification to
the strbuf.
This is theoretically less efficient, as some callbacks
would not bother to format the final path component. But in
practice this is not measurable. Since we use the same
strbuf over and over, our work to grow it is amortized, and
we really only pay to memcpy a few bytes.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-bitmap-write.c')
-rw-r--r-- | pack-bitmap-write.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 65ed3425b3..c30bcd06cb 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -148,8 +148,7 @@ static uint32_t find_object_pos(const unsigned char *sha1) return entry->in_pack_pos; } -static void show_object(struct object *object, struct strbuf *path, - const char *last, void *data) +static void show_object(struct object *object, const char *name, void *data) { struct bitmap *base = data; bitmap_set(base, find_object_pos(object->oid.hash)); |