path: root/builtin/for-each-ref.c
diff options
authorJeff King <>2013-10-30 06:50:16 (GMT)
committerJunio C Hamano <>2013-10-30 17:33:46 (GMT)
commitb74cf648036af764a176898763a0ec066a77a92f (patch)
treea5106f3db9eb220d882365d46f504c85b5be861b /builtin/for-each-ref.c
parente230c568c4b9a991e3175e5f65171a566fd8e39c (diff)
for-each-ref: avoid loading objects to print %(objectname)
If you ask for-each-ref to print each ref and its object, like: git for-each-ref --format='%(objectname) %(refname)' this should involve little more work than looking at the ref files (and packed-refs) themselves. However, for-each-ref will actually load each object from disk just to print its sha1. For most repositories, this isn't a big deal, but it can be noticeable if you have a large number of refs to print. Here are best-of-five timings for the command above on a repo with ~10K refs: [before] real 0m0.112s user 0m0.092s sys 0m0.016s [after] real 0m0.014s user 0m0.012s sys 0m0.000s This patch checks for %(objectname) and %(objectname:short) before we actually parse the object (and the rest of the code is smart enough to avoid parsing if we have filled all of our placeholders). Note that we can't simply move the objectname parsing code into the early loop. If the "deref" form %(*objectname) is used, then we do need to parse the object in order to peel the tag. So instead of moving the code, we factor it out into a separate function that can be called for both cases. While we're at it, we add some basic tests for the dereferenced placeholders, which were not tested at all before. This helps ensure we didn't regress that case. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/for-each-ref.c')
1 files changed, 20 insertions, 9 deletions
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 7f059c3..b84b6c1 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -205,6 +205,22 @@ static void *get_obj(const unsigned char *sha1, struct object **obj, unsigned lo
return buf;
+static int grab_objectname(const char *name, const unsigned char *sha1,
+ struct atom_value *v)
+ if (!strcmp(name, "objectname")) {
+ char *s = xmalloc(41);
+ strcpy(s, sha1_to_hex(sha1));
+ v->s = s;
+ return 1;
+ }
+ if (!strcmp(name, "objectname:short")) {
+ v->s = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
+ return 1;
+ }
+ return 0;
/* See grab_values */
static void grab_common_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)
@@ -225,15 +241,8 @@ static void grab_common_values(struct atom_value *val, int deref, struct object
v->ul = sz;
v->s = s;
- else if (!strcmp(name, "objectname")) {
- char *s = xmalloc(41);
- strcpy(s, sha1_to_hex(obj->sha1));
- v->s = s;
- }
- else if (!strcmp(name, "objectname:short")) {
- v->s = xstrdup(find_unique_abbrev(obj->sha1,
- }
+ else if (deref)
+ grab_objectname(name, obj->sha1, v);
@@ -676,6 +685,8 @@ static void populate_value(struct refinfo *ref)
+ else if (!deref && grab_objectname(name, ref->objectname, v))
+ continue;