From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date: Sat, 15 Oct 2011 17:46:59 +0000 (+0100)
Subject: fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
X-Git-Tag: v1.7.9-rc0~37^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=90a321c04c639488e7f66fa4dd53b14c2363cd70;p=git.git

fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 1350462d4..f6d92e263 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -37,7 +37,7 @@ struct src_data {
 
 struct origin_data {
 	unsigned char sha1[20];
-	int is_local_branch:1;
+	unsigned is_local_branch:1;
 };
 
 static void init_src_data(struct src_data *data)