aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-16 00:17:05 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-16 00:17:05 -0700
commit276e017f2f632e9bd954bd5a6b794fe0865a5f37 (patch)
tree292099a254e75e6b828a07904f51e9498529c2ba /cache.h
parenta62eafb0aaf3fa8265744954d6f0c2c7c7f97682 (diff)
parent9ddf17268c632967abf2dadf9fa2b9d11dcc1867 (diff)
downloadgit-276e017f2f632e9bd954bd5a6b794fe0865a5f37.tar.gz
git-276e017f2f632e9bd954bd5a6b794fe0865a5f37.tar.xz
Merge branch 'nd/struct-pathspec'
* nd/struct-pathspec: declare 1-bit bitfields to be unsigned
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/cache.h b/cache.h
index c4ef99976..8d18a113c 100644
--- a/cache.h
+++ b/cache.h
@@ -503,13 +503,13 @@ extern int ie_modified(const struct index_state *, struct cache_entry *, struct
struct pathspec {
const char **raw; /* get_pathspec() result, not freed by free_pathspec() */
int nr;
- int has_wildcard:1;
- int recursive:1;
+ unsigned int has_wildcard:1;
+ unsigned int recursive:1;
int max_depth;
struct pathspec_item {
const char *match;
int len;
- int has_wildcard:1;
+ unsigned int has_wildcard:1;
} *items;
};