Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'

diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 7f5011f75ef9eb549b33861d9546f3d18a94c256..89e75c6894e6fdb2abbe464d825f5c7186a14141 100644 (file)
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -227,6 +227,10 @@ 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 = xstrdup(find_unique_abbrev(obj->sha1,
+                                                         DEFAULT_ABBREV));
+               }
        }
 }