Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index e4f4664..d407f39 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -313,6 +313,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[];
 };