Merge branch 'fc/makefile'

diff --git a/cache.h b/cache.h
index 7ce90611373ba9f0b3d7ab12eef53639458d241e..df532f8e4a597a0c9c4d3cbb4980f5d62a106334 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1025,9 +1025,21 @@ struct ref {
        unsigned int
                force:1,
                forced_update:1,
-               merge:1,
                deletion:1,
                matched:1;
+
+       /*
+        * Order is important here, as we write to FETCH_HEAD
+        * in numeric order. And the default NOT_FOR_MERGE
+        * should be 0, so that xcalloc'd structures get it
+        * by default.
+        */
+       enum {
+               FETCH_HEAD_MERGE = -1,
+               FETCH_HEAD_NOT_FOR_MERGE = 0,
+               FETCH_HEAD_IGNORE = 1
+       } fetch_head_status;
+
        enum {
                REF_STATUS_NONE = 0,
                REF_STATUS_OK,