Merge refs/heads/master from .

1 files changed, 1 insertions, 0 deletions

diff --git a/cache.h b/cache.h
index ba5c4ab7e..1478631b4 100644
--- a/cache.h
+++ b/cache.h
@@ -309,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];
 };