path: root/list-objects.c
diff options
authorJeff King <>2016-02-11 22:28:36 (GMT)
committerJunio C Hamano <>2016-02-12 20:51:17 (GMT)
commitde1e67d0703894cb6ea782e36abb63976ab07e60 (patch)
tree8229efe404fc34d5549d98e06998872919523e85 /list-objects.c
parentbd64516aca4d4e22acb33c71429d293a14d355cf (diff)
list-objects: pass full pathname to callbacks
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'list-objects.c')
1 files changed, 9 insertions, 5 deletions
diff --git a/list-objects.c b/list-objects.c
index 4397766..917cc5d 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -16,6 +16,7 @@ static void process_blob(struct rev_info *revs,
void *cb_data)
struct object *obj = &blob->object;
+ size_t pathlen;
if (!revs->blob_objects)
@@ -24,7 +25,11 @@ static void process_blob(struct rev_info *revs,
if (obj->flags & (UNINTERESTING | SEEN))
obj->flags |= SEEN;
- show(obj, path, name, cb_data);
+ pathlen = path->len;
+ strbuf_addstr(path, name);
+ show(obj, path->buf, cb_data);
+ strbuf_setlen(path, pathlen);
@@ -86,9 +91,8 @@ static void process_tree(struct rev_info *revs,
obj->flags |= SEEN;
- show(obj, base, name, cb_data);
strbuf_addstr(base, name);
+ show(obj, base->buf, cb_data);
if (base->len)
strbuf_addch(base, '/');
@@ -207,7 +211,7 @@ void traverse_commit_list(struct rev_info *revs,
if (obj->type == OBJ_TAG) {
obj->flags |= SEEN;
- show_object(obj, NULL, name, data);
+ show_object(obj, name, data);
if (!path)
@@ -219,7 +223,7 @@ void traverse_commit_list(struct rev_info *revs,
if (obj->type == OBJ_BLOB) {
process_blob(revs, (struct blob *)obj, show_object,
- NULL, path, data);
+ &base, path, data);
die("unknown pending object %s (%s)",