Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
author
Ramsay Jones
<ramsay@ramsay1.demon.co.uk>
Sat, 15 Oct 2011 17:46:59 +0000
(18:46 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 16 Oct 2011 03:20:13 +0000
(20:20 -0700)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/fmt-merge-msg.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
273c703
)
diff --git
a/builtin/fmt-merge-msg.c
b/builtin/fmt-merge-msg.c
index 1350462d43e5deb3e2ebe98ee2f5ec89f45912f3..f6d92e263ce6c8b37c1d554e15d6693a049be071 100644
(file)
--- 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)