diff options
| author | Mazo, Andrey <amazo@checkvideo.com> | 2019-04-01 18:02:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-02 11:25:42 +0900 |
| commit | d15068a6501bec72fddec9f79372a5e3ce5e1379 (patch) | |
| tree | d0000778f88719ca9a062e9d3b0de9c8130305ca | |
| parent | 607a3be6d0f3144b311bfe2fd2b0e5ab4a250e89 (diff) | |
| download | git-d15068a6501bec72fddec9f79372a5e3ce5e1379.tar.xz | |
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>
| -rwxr-xr-x | git-p4.py | 3 | ||||
| -rwxr-xr-x | t/t9801-git-p4-branch.sh | 2 |
2 files changed, 2 insertions, 3 deletions
@@ -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 diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index 7530d22de2..9654362052 100755 --- a/t/t9801-git-p4-branch.sh +++ b/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" && ( |