From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Mar 2011 16:20:13 +0000 (-0700)
Subject: Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
X-Git-Tag: v1.7.6-rc0~103^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f2cfc9c81ea2fe72ea0ac57d63e71e10e8b0af94?hp=a97a96fc9667cd84dc350db309135ea52adac18d

Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'

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

diff --git a/cache.h b/cache.h
index 4beb2dc6ff..edd5b5ad8f 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;
 };