Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Mar 2011 16:20:13 +0000 (09:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Mar 2011 16:20:13 +0000 (09:20 -0700)
This is to improve the process_tree() function defined in list-objects.c

* en/object-list-with-pathspec:
Add testcases showing how pathspecs are handled with rev-list --objects
Make rev-list --objects work together with pathspecs

cache.h
diff --git a/cache.h b/cache.h
index 4beb2dc6ff875322f970eccbf3980746527a91ab..edd5b5ad8fc28440954b1066f304eab86e6a64d1 100644 (file)
--- 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;
 };