Merge branch 'gp/pack-refs-remove-empty-dirs'

diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 7f5011f75ef9eb549b33861d9546f3d18a94c256..a2b28c6962be8ea6f8882bae3d4fde9d972e78d2 100644 (file)
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -227,6 +227,9 @@ static void grab_common_values(struct atom_value *val, int deref, struct object
                        strcpy(s, sha1_to_hex(obj->sha1));
                        v->s = s;
                }
+               else if (!strcmp(name, "objectname:short")) {
+                       v->s = find_unique_abbrev(obj->sha1, DEFAULT_ABBREV);
+               }
        }
 }