X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=1478631b40bf122556e50d19686868b1fb03b712;hb=ff3412ee1f74cc267e6d65c03c5fd8ea2214fbe7;hp=742378f40ffb3746c72af7e470c94fe9735ca0a4;hpb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;p=git.git

diff --git a/cache.h b/cache.h
index 742378f4..1478631b 100644
--- a/cache.h
+++ b/cache.h
@@ -38,10 +38,9 @@
 #define NORETURN __attribute__((__noreturn__))
 #else
 #define NORETURN
-#endif
-
 #ifndef __attribute__
-#define __attribute(x)
+#define __attribute__(x)
+#endif
 #endif
 
 /*
@@ -310,6 +309,7 @@ struct ref {
 	struct ref *next;
 	unsigned char old_sha1[20];
 	unsigned char new_sha1[20];
+	unsigned char force;
 	struct ref *peer_ref; /* when renaming */
 	char name[0];
 };