diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-21 23:03:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-21 23:03:46 -0700 |
| commit | 805c5a578995db7594ad0751a683bc6422655c29 (patch) | |
| tree | bcd85fec449cc0f6b4c5c61931aedd07f18d4a43 /t | |
| parent | Sync with maint (diff) | |
| parent | Update draft release notes to 1.8.3.4 (diff) | |
| download | tgif-805c5a578995db7594ad0751a683bc6422655c29.tar.xz | |
Sync with maint
* maint:
Update draft release notes to 1.8.3.4
t9801: git-p4: check ignore files with client spec
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9801-git-p4-branch.sh | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index 9730821c30..2bf142d09c 100755 --- a/t/t9801-git-p4-branch.sh +++ b/t/t9801-git-p4-branch.sh @@ -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 ' |