development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 21:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync with maint

Browse source 
* maint:
  Update draft release notes to 1.8.3.4
  t9801: git-p4: check ignore files with client spec
This commit is contained in:
Junio C Hamano 2013-07-21 23:03:46 -07:00
parent e3d4493031 31fe4057b1
commit 805c5a5789
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Documentation/RelNotes/1.8.3.4.txt
View file

@ -13,3 +13,8 @@ Fixes since v1.8.3.3
* The test coverage framework was left broken for some time.
* The test suite for HTTP transport did not run with Apache 2.4.
* "git diff" used to fail when core.safecrlf is set and the working
tree contents had mixed CRLF/LF line endings. Committing such a
content must be prohibited, but "git diff" should help the user to
locate and fix such problems without failing.

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
'