tree_entry_interesting(): fix depth limit with overlapping pathspecs

pclouds · gitster · commit 86e4ca69e358 · 2011-02-03T14:08:30.000-08:00
Suppose we have two pathspecs 'a' and 'a/b' (both are dirs) and depth
limit 1. In current code, pathspecs are checked in input order. When
'a/b' is checked against pathspec 'a', it fails depth limit and
therefore is excluded, although it should match 'a/b' pathspec.

This patch reorders all pathspecs alphabetically, then teaches
tree_entry_interesting() to check against the deepest pathspec first,
so depth limit of a shallower pathspec won't affect a deeper one.

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/dir.c b/dir.c
@@ -1166,6 +1166,15 @@ int remove_path(const char *name)
 	return 0;
 }
 
+static int pathspec_item_cmp(const void *a_, const void *b_)
+{
+	struct pathspec_item *a, *b;
+
+	a = (struct pathspec_item *)a_;
+	b = (struct pathspec_item *)b_;
+	return strcmp(a->match, b->match);
+}
+
 int init_pathspec(struct pathspec *pathspec, const char **paths)
 {
 	const char **p = paths;
@@ -1189,6 +1198,10 @@ int init_pathspec(struct pathspec *pathspec, const char **paths)
 		item->match = path;
 		item->len = strlen(path);
 	}
+
+	qsort(pathspec->items, pathspec->nr,
+	      sizeof(struct pathspec_item), pathspec_item_cmp);
+
 	return 0;
 }
 
diff --git a/tree-walk.c b/tree-walk.c
@@ -570,7 +570,7 @@ int tree_entry_interesting(const struct name_entry *entry,
 
 	pathlen = tree_entry_len(entry->path, entry->sha1);
 
-	for (i = 0; i < ps->nr; i++) {
+	for (i = ps->nr-1; i >= 0; i--) {
 		const struct pathspec_item *item = ps->items+i;
 		const char *match = item->match;
 		int matchlen = item->len;

Original file line number	Diff line number	Diff line change
`@@ -1166,6 +1166,15 @@ int remove_path(const char *name)`
`1166`	`1166`	`return 0;`
`1167`	`1167`	`}`
`1168`	`1168`
	`1169`	`+static int pathspec_item_cmp(const void a_, const void b_)`
	`1170`	`+{`
	`1171`	`+ struct pathspec_item a, b;`
	`1172`	`+`
	`1173`	`+ a = (struct pathspec_item *)a_;`
	`1174`	`+ b = (struct pathspec_item *)b_;`
	`1175`	`+ return strcmp(a->match, b->match);`
	`1176`	`+}`
	`1177`	`+`
`1169`	`1178`	`int init_pathspec(struct pathspec pathspec, const char *paths)`
`1170`	`1179`	`{`
`1171`	`1180`	`const char **p = paths;`
`@@ -1189,6 +1198,10 @@ int init_pathspec(struct pathspec pathspec, const char *paths)`
`1189`	`1198`	`item->match = path;`
`1190`	`1199`	`item->len = strlen(path);`
`1191`	`1200`	`}`
	`1201`	`+`
	`1202`	`+ qsort(pathspec->items, pathspec->nr,`
	`1203`	`+ sizeof(struct pathspec_item), pathspec_item_cmp);`
	`1204`	`+`
`1192`	`1205`	`return 0;`
`1193`	`1206`	`}`
`1194`	`1207`