tree_entry_interesting(): fix depth limit with overlapping pathspecs

pclouds · gitster · commit 9d7d10ef7b23 · 2010-12-16T13:20:22.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
@@ -1086,6 +1086,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;
@@ -1109,6 +1118,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
@@ -568,7 +568,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
`@@ -1086,6 +1086,15 @@ int remove_path(const char *name)`
`1086`	`1086`	`return 0;`
`1087`	`1087`	`}`
`1088`	`1088`
	`1089`	`+static int pathspec_item_cmp(const void a_, const void b_)`
	`1090`	`+{`
	`1091`	`+ struct pathspec_item a, b;`
	`1092`	`+`
	`1093`	`+ a = (struct pathspec_item *)a_;`
	`1094`	`+ b = (struct pathspec_item *)b_;`
	`1095`	`+ return strcmp(a->match, b->match);`
	`1096`	`+}`
	`1097`	`+`
`1089`	`1098`	`int init_pathspec(struct pathspec pathspec, const char *paths)`
`1090`	`1099`	`{`
`1091`	`1100`	`const char **p = paths;`
`@@ -1109,6 +1118,10 @@ int init_pathspec(struct pathspec pathspec, const char *paths)`
`1109`	`1118`	`item->match = path;`
`1110`	`1119`	`item->len = strlen(path);`
`1111`	`1120`	`}`
	`1121`	`+`
	`1122`	`+ qsort(pathspec->items, pathspec->nr,`
	`1123`	`+ sizeof(struct pathspec_item), pathspec_item_cmp);`
	`1124`	`+`
`1112`	`1125`	`return 0;`
`1113`	`1126`	`}`
`1114`	`1127`