diff-tree: fix up comparison of "interesting" sub-trees
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 18 May 2005 20:50:24 +0000 (13:50 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 18 May 2005 20:50:24 +0000 (13:50 -0700)
We used to trigger the "interesting subdirectory" check for any
matching name that started with the same character series, regardless
of whether it had the matching slash or not.

diff-tree.c

index acd15243435742fdeb3bbdc29c1ff7ffa27cbb2f..3bc7480944037e1c0964217d35b5f1014e4f43fd 100644 (file)
@@ -209,6 +209,11 @@ static int interesting(void *tree, unsigned long size, const char *base)
                if (pathlen > matchlen)
                        continue;
 
+               if (matchlen > pathlen) {
+                       if (match[pathlen] != '/')
+                               continue;
+               }
+
                if (strncmp(path, match, pathlen))
                        continue;