Merge branch 'maint'

diff --git a/cache.h b/cache.h
index d5d5dad1463e2251dc84cf0a85095a7e3e0eaeae..7fb8f3359dddbb8f93aa827947c3e5d9de04f639 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -635,6 +635,7 @@ struct ref {
        struct ref *next;
        unsigned char old_sha1[20];
        unsigned char new_sha1[20];
+       char *symref;
        unsigned int force:1,
                merge:1,
                nonfastforward:1,