push: further clean up fields of "struct ref"

diff --git a/cache.h b/cache.h
index a942bbd59f87600b597c452f92e9faaf1a7737bf..12631a17d3367c8dd1478c9061fd214c291cd019 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1001,10 +1001,8 @@ struct ref {
        char *symref;
        unsigned int
                force:1,
-               requires_force:1,
+               forced_update:1,
                merge:1,
-               nonfastforward:1,
-               update:1,
                deletion:1;
        enum {
                REF_STATUS_NONE = 0,