Merge branch 'stable'

diff --git a/ui-plain.c b/ui-plain.c
index 27c6daec7f1dc71bfd7b8b74c8179467a5d39224..a4ce077ac512f4735ea693967a5a0b375473bbf7 100644 (file)
--- 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;