Merge branch 'stable'

16 years ago · 670f990979
parent b44c40ea72 b507252b46
commit 670f990979
1 changed files with 2 additions and 1 deletions
--- a/ui-plain.c
+++ b/ui-plain.c
@ -60,7 +60,8 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 	if (S_ISDIR(mode))
 		return READ_TREE_RECURSIVE;

-	if (S_ISREG(mode))
+	if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&
+	    !strcmp(pathname, match_path + baselen))
 		print_object(sha1, pathname);

 	return 0;