Revision 2f3b28f27234a0130583131a6785c44e3dd1cac4 authored by Johannes Schindelin on 09 March 2023, 22:08:47 UTC, committed by Johannes Schindelin on 17 April 2023, 19:15:37 UTC
The `maint-2.30` branch accumulated quite a few fixes over the past two years. Most of those fixes were originally based on newer versions, and while the patches cherry-picked cleanly, we weren't diligent enough to pay attention to the CI builds and the GETTEXT_POISON job regressed. This topic branch fixes that. * js/gettext-poison-fixes t0033: GETTEXT_POISON fix t0003: GETTEXT_POISON fix, part 1 t0003: GETTEXT_POISON fix, conclusion t5619: GETTEXT_POISON fix t5604: GETTEXT_POISON fix, part 1 t5604: GETTEXT_POISON fix, conclusion
t9817-git-p4-exclude.sh
#!/bin/sh
test_description='git p4 tests for excluded paths during clone and sync'
. ./lib-git-p4.sh
test_expect_success 'start p4d' '
start_p4d
'
# Create a repo with the structure:
#
# //depot/wanted/foo
# //depot/discard/foo
#
# Check that we can exclude a subdirectory with both
# clone and sync operations.
test_expect_success 'create exclude repo' '
(
cd "$cli" &&
mkdir -p wanted discard &&
echo wanted >wanted/foo &&
echo discard >discard/foo &&
echo discard_file >discard_file &&
echo discard_file_not >discard_file_not &&
p4 add wanted/foo discard/foo discard_file discard_file_not &&
p4 submit -d "initial revision"
)
'
test_expect_success 'check the repo was created correctly' '
test_when_finished cleanup_git &&
git p4 clone --dest="$git" //depot/...@all &&
(
cd "$git" &&
test_path_is_file wanted/foo &&
test_path_is_file discard/foo &&
test_path_is_file discard_file &&
test_path_is_file discard_file_not
)
'
test_expect_success 'clone, excluding part of repo' '
test_when_finished cleanup_git &&
git p4 clone -//depot/discard/... --dest="$git" //depot/...@all &&
(
cd "$git" &&
test_path_is_file wanted/foo &&
test_path_is_missing discard/foo &&
test_path_is_file discard_file &&
test_path_is_file discard_file_not
)
'
test_expect_success 'clone, excluding single file, no trailing /' '
test_when_finished cleanup_git &&
git p4 clone -//depot/discard_file --dest="$git" //depot/...@all &&
(
cd "$git" &&
test_path_is_file wanted/foo &&
test_path_is_file discard/foo &&
test_path_is_missing discard_file &&
test_path_is_file discard_file_not
)
'
test_expect_success 'clone, then sync with exclude' '
test_when_finished cleanup_git &&
git p4 clone -//depot/discard/... --dest="$git" //depot/...@all &&
(
cd "$cli" &&
p4 edit wanted/foo discard/foo discard_file_not &&
date >>wanted/foo &&
date >>discard/foo &&
date >>discard_file_not &&
p4 submit -d "updating" &&
cd "$git" &&
git p4 sync -//depot/discard/... &&
test_path_is_file wanted/foo &&
test_path_is_missing discard/foo &&
test_path_is_file discard_file &&
test_path_is_file discard_file_not
)
'
test_expect_success 'clone, then sync with exclude, no trailing /' '
test_when_finished cleanup_git &&
git p4 clone -//depot/discard/... -//depot/discard_file --dest="$git" //depot/...@all &&
(
cd "$cli" &&
p4 edit wanted/foo discard/foo discard_file_not &&
date >>wanted/foo &&
date >>discard/foo &&
date >>discard_file_not &&
p4 submit -d "updating" &&
cd "$git" &&
git p4 sync -//depot/discard/... -//depot/discard_file &&
test_path_is_file wanted/foo &&
test_path_is_missing discard/foo &&
test_path_is_missing discard_file &&
test_path_is_file discard_file_not
)
'
test_done
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...