git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
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>
Mazo, Andrey committed
Apr 1, 2019 at 18:02 UTC
607a3be6d0f3144b311bfe2fd2b0e5ab4a250e89
1 file changed
+40
t/t9801-git-p4-branch.sh
+40
@@ -411,6 +411,46 @@ test_expect_failure 'git p4 clone file subset branch' '
411
)
412
'
413
414
+# Check that excluded files are omitted during import
415
+test_expect_failure 'git p4 clone complex branches with excluded files' '
416
+ test_when_finished cleanup_git &&
417
+ test_create_repo "$git" &&
418
+ (
419
+ cd "$git" &&
420
+ git config git-p4.branchList branch1:branch2 &&
421
+ git config --add git-p4.branchList branch1:branch3 &&
422
+ git config --add git-p4.branchList branch1:branch4 &&
423
+ git config --add git-p4.branchList branch1:branch5 &&
424
+ git config --add git-p4.branchList branch1:branch6 &&
425
+ 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 &&
426
+ git log --all --graph --decorate --stat &&
427
+ git reset --hard p4/depot/branch1 &&
428
+ test_path_is_file file1 &&
429
+ test_path_is_missing file2 &&
430
+ test_path_is_file file3 &&
431
+ git reset --hard p4/depot/branch2 &&
432
+ test_path_is_file file1 &&
433
+ test_path_is_missing file2 &&
434
+ test_path_is_missing file3 &&
435
+ git reset --hard p4/depot/branch3 &&
436
+ test_path_is_file file1 &&
437
+ test_path_is_missing file2 &&
438
+ test_path_is_missing file3 &&
439
+ git reset --hard p4/depot/branch4 &&
440
+ test_path_is_file file1 &&
441
+ test_path_is_missing file2 &&
442
+ test_path_is_file file3 &&
443
+ git reset --hard p4/depot/branch5 &&
444
+ test_path_is_file file1 &&
445
+ test_path_is_missing file2 &&
446
+ test_path_is_file file3 &&
447
+ git reset --hard p4/depot/branch6 &&
448
+ test_path_is_file file1 &&
449
+ test_path_is_missing file2 &&
450
+ test_path_is_missing file3
451
+ )
452
+'
453
+
454
# From a report in http://stackoverflow.com/questions/11893688
455
# where --use-client-spec caused branch prefixes not to be removed;
456
# every file in git appeared into a subdirectory of the branch name.