Skip to content

Commit 7c8ce4e

Browse files
vhdagitster
authored andcommitted
t9801: git-p4: check ignore files with client spec
This test confirms that a file can be ignored during git p4 sync if if is excluded in P4 client specification. Signed-off-by: Vitor Antunes <[email protected]> Acked-by: Pete Wyckoff <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f893b74 commit 7c8ce4e

File tree

1 file changed

+20
-3
lines changed

1 file changed

+20
-3
lines changed

t/t9801-git-p4-branch.sh

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,11 @@ test_expect_success 'use-client-spec detect-branches skips branches setup' '
469469
View: //depot/usecs/b1/... //depot/usecs/b3/...
470470
EOF
471471
472-
echo b3/b3-file3 >b3/b3-file3 &&
473-
p4 add b3/b3-file3 &&
474-
p4 submit -d "b3/b3-file3"
472+
echo b3/b3-file3_1 >b3/b3-file3_1 &&
473+
echo b3/b3-file3_2 >b3/b3-file3_2 &&
474+
p4 add b3/b3-file3_1 &&
475+
p4 add b3/b3-file3_2 &&
476+
p4 submit -d "b3/b3-file3_1 b3/b3-file3_2"
475477
)
476478
'
477479

@@ -487,6 +489,21 @@ test_expect_success 'use-client-spec detect-branches skips branches' '
487489
)
488490
'
489491

492+
test_expect_success 'use-client-spec detect-branches skips files in branches' '
493+
client_view "//depot/usecs/... //client/..." \
494+
"-//depot/usecs/b3/b3-file3_1 //client/b3/b3-file3_1" &&
495+
test_when_finished cleanup_git &&
496+
test_create_repo "$git" &&
497+
(
498+
cd "$git" &&
499+
git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
500+
git checkout -b master p4/usecs/b3 &&
501+
test_path_is_file b1-file1 &&
502+
test_path_is_file b3-file3_2 &&
503+
test_path_is_missing b3-file3_1
504+
)
505+
'
506+
490507
test_expect_success 'kill p4d' '
491508
kill_p4d
492509
'

0 commit comments

Comments
 (0)