summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2011-10-15 17:46:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-16 03:20:13 (GMT)
commit90a321c04c639488e7f66fa4dd53b14c2363cd70 (patch)
treebe593171be4509d74b83faae1b8e1af0aa0e942c
parent273c7032e9e79613349e24db3b0e40e8b5c0c62c (diff)
downloadgit-90a321c04c639488e7f66fa4dd53b14c2363cd70.zip
git-90a321c04c639488e7f66fa4dd53b14c2363cd70.tar.gz
git-90a321c04c639488e7f66fa4dd53b14c2363cd70.tar.bz2
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>
-rw-r--r--builtin/fmt-merge-msg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 1350462..f6d92e2 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)