Merge branch 'jc/request-pull-show-head-4' into next

* jc/request-pull-show-head-4:
  fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
This commit is contained in:
Junio C Hamano
2011-10-15 21:00:21 -07:00

View File

@@ -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)