Merge branch 'nd/struct-pathspec'

* nd/struct-pathspec:
  declare 1-bit bitfields to be unsigned
This commit is contained in:
Junio C Hamano 2011-03-16 00:17:05 -07:00
commit 276e017f2f

View File

@ -503,13 +503,13 @@ extern int ie_modified(const struct index_state *, struct cache_entry *, struct
struct pathspec { struct pathspec {
const char **raw; /* get_pathspec() result, not freed by free_pathspec() */ const char **raw; /* get_pathspec() result, not freed by free_pathspec() */
int nr; int nr;
int has_wildcard:1; unsigned int has_wildcard:1;
int recursive:1; unsigned int recursive:1;
int max_depth; int max_depth;
struct pathspec_item { struct pathspec_item {
const char *match; const char *match;
int len; int len;
int has_wildcard:1; unsigned int has_wildcard:1;
} *items; } *items;
}; };