undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"

Browse Source 
In preparation for a fix, add a failing test case to test that
git-p4 doesn't exclude files despite being told to
when handling multiple branches.

I.e., it should exclude //depot/branch2/file2 when run with -//depot/branch2/file2,
but doesn't do this right now.

The test is based on 'git p4 clone complex branches' test with the following changes:
 * account for file3 moved from branch3 to branch4 in test 'git p4 submit to two branches in a single changelist';
 * account for branch6 created in test 'git p4 clone file subset branch';
 * file2 is expected to be missing from all branches due to explicit exclude.

Signed-off-by: Andrey Mazo <amazo@checkvideo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mazo, Andrey 2019-04-01 18:02:35 +00:00 committed by Junio C Hamano
parent a2bee10ad9
commit 607a3be6d0
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
t/t9801-git-p4-branch.sh
View File

@ -411,6 +411,46 @@ 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_when_finished cleanup_git &&
test_create_repo "$git" &&
(
cd "$git" &&
git config git-p4.branchList branch1:branch2 &&
git config --add git-p4.branchList branch1:branch3 &&
git config --add git-p4.branchList branch1:branch4 &&
git config --add git-p4.branchList branch1:branch5 &&
git config --add git-p4.branchList branch1:branch6 &&
git p4 clone --dest=. --detect-branches -//depot/branch1/file2 -//depot/branch2/file2 -//depot/branch3/file2 -//depot/branch4/file2 -//depot/branch5/file2 -//depot/branch6/file2 //depot@all &&
git log --all --graph --decorate --stat &&
git reset --hard p4/depot/branch1 &&
test_path_is_file file1 &&
test_path_is_missing file2 &&
test_path_is_file file3 &&
git reset --hard p4/depot/branch2 &&
test_path_is_file file1 &&
test_path_is_missing file2 &&
test_path_is_missing file3 &&
git reset --hard p4/depot/branch3 &&
test_path_is_file file1 &&
test_path_is_missing file2 &&
test_path_is_missing file3 &&
git reset --hard p4/depot/branch4 &&
test_path_is_file file1 &&
test_path_is_missing file2 &&
test_path_is_file file3 &&
git reset --hard p4/depot/branch5 &&
test_path_is_file file1 &&
test_path_is_missing file2 &&
test_path_is_file file3 &&
git reset --hard p4/depot/branch6 &&
test_path_is_file file1 &&
test_path_is_missing file2 &&
test_path_is_missing file3
)
'
# From a report in http://stackoverflow.com/questions/11893688
# where --use-client-spec caused branch prefixes not to be removed;
# every file in git appeared into a subdirectory of the branch name.