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

t9801: git-p4: check ignore files with client spec

Browse Source 
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 <vitor.hda@gmail.com>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vitor Antunes 2013-07-19 00:04:53 +01:00 committed by Junio C Hamano
parent f893b7420c
commit 7c8ce4ed32
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,9 +469,11 @@ test_expect_success 'use-client-spec detect-branches skips branches setup' '
View: //depot/usecs/b1/... //depot/usecs/b3/...
EOF
echo b3/b3-file3 >b3/b3-file3 &&
p4 add b3/b3-file3 &&
p4 submit -d "b3/b3-file3"
echo b3/b3-file3_1 >b3/b3-file3_1 &&
echo b3/b3-file3_2 >b3/b3-file3_2 &&
p4 add b3/b3-file3_1 &&
p4 add b3/b3-file3_2 &&
p4 submit -d "b3/b3-file3_1 b3/b3-file3_2"
)
'
@ -487,6 +489,21 @@ test_expect_success 'use-client-spec detect-branches skips branches' '
)
'
test_expect_success 'use-client-spec detect-branches skips files in branches' '
client_view "//depot/usecs/... //client/..." \
"-//depot/usecs/b3/b3-file3_1 //client/b3/b3-file3_1" &&
test_when_finished cleanup_git &&
test_create_repo "$git" &&
(
cd "$git" &&
git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
git checkout -b master p4/usecs/b3 &&
test_path_is_file b1-file1 &&
test_path_is_file b3-file3_2 &&
test_path_is_missing b3-file3_1
)
'
test_expect_success 'kill p4d' '
kill_p4d
'