git-p4: respect excluded paths when detecting branches

Currently, excluded paths are only handled in the following cases:
 * no branch detection;
 * branch detection with using clientspec.

However, excluded paths are not respected in case of
branch detection without using clientspec.

Fix this by consulting the list of excluded paths
when splitting files across branches.

Signed-off-by: Andrey Mazo <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>

Author: Mazo, Andrey

git-p4.py

@@ -2710,8 +2710,7 @@ def splitFilesIntoBranches(self, commit):
         fnum = 0
         while "depotFile%s" % fnum in commit:
             path =  commit["depotFile%s" % fnum]
-            found = [p for p in self.depotPaths
-                     if p4PathStartsWith(path, p)]
+            found = self.isPathWanted(path)
             if not found:
                 fnum = fnum + 1
                 continue

t/t9801-git-p4-branch.sh

@@ -412,7 +412,7 @@ test_expect_failure 'git p4 clone file subset branch' '
 '
 
 # Check that excluded files are omitted during import
-test_expect_failure 'git p4 clone complex branches with excluded files' '
+test_expect_success 'git p4 clone complex branches with excluded files' '
 	test_when_finished cleanup_git &&
 	test_create_repo "$git" &&
 	(