Merge branch 'master' into next

* master:
  notes.h: declare bit field as unsigned to silence compiler complaints
This commit is contained in:
Junio C Hamano
2010-04-06 22:51:29 -07:00

View File

@@ -212,7 +212,7 @@ void format_note(struct notes_tree *t, const unsigned char *object_sha1,
struct string_list;
struct display_notes_opt {
int suppress_default_notes:1;
unsigned int suppress_default_notes:1;
struct string_list *extra_notes_refs;
};