summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorMazo, Andrey <amazo@checkvideo.com>2019-04-01 18:02:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-02 02:25:42 (GMT)
commitd15068a6501bec72fddec9f79372a5e3ce5e1379 (patch)
treed0000778f88719ca9a062e9d3b0de9c8130305ca /git-p4.py
parent607a3be6d0f3144b311bfe2fd2b0e5ab4a250e89 (diff)
downloadgit-d15068a6501bec72fddec9f79372a5e3ce5e1379.zip
git-d15068a6501bec72fddec9f79372a5e3ce5e1379.tar.gz
git-d15068a6501bec72fddec9f79372a5e3ce5e1379.tar.bz2
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 <amazo@checkvideo.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-p4.py b/git-p4.py
index c47bd8c..96c4b78 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2710,8 +2710,7 @@ class P4Sync(Command, P4UserMap):
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