Show the branch name more prominently in "git status".
[gitweb.git] / cache.h
diff --git a/cache.h b/cache.h
index 742378f40ffb3746c72af7e470c94fe9735ca0a4..1478631b40bf122556e50d19686868b1fb03b712 100644 (file)
--- a/cache.h
+++ b/cache.h
 #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];
 };