[PATCH 2/5] merge-tree: lose unused "flags" from merge_list

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 26, 2012, 23:03 UTC
Message-ID: <1356563020-13919-3-git-send-email-gitster@pobox.com>
In-Reply-To: <1356563020-13919-1-git-send-email-gitster@pobox.com>

Drop the unused field from the structure.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/merge-tree.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index ebd0d25..b61d811 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -12,8 +12,7 @@ struct merge_list {
 	struct merge_list *next;
 	struct merge_list *link;	/* other stages for this object */
 
-	unsigned int stage : 2,
-		     flags : 30;
+	unsigned int stage : 2;
 	unsigned int mode;
 	const char *path;
 	struct blob *blob;

-- 
1.8.1.rc3.356.g686f81c