mirror of
https://github.com/git/git.git
synced 2024-05-19 23:26:13 +02:00
99e37c2560
Use 'test_atexit' to run cleanup commands to stop 'p4d' at the end of
the test script or upon interrupt or failure, as it is shorter,
simpler, and more robust than registering such cleanup commands in the
trap on EXIT in the test scripts.
Note that one of the test scripts, 't9801-git-p4-branch.sh', stops and
then re-starts 'p4d' twice in the middle of the script; take care that
the cleanup functions to stop 'p4d' are only registered once.
Note also that 'git p4' tests invoke different functions in the trap
on EXIT ('cleanup') and in the last test before 'test_done'
('kill_p4d'). Register both of these functions with 'test_atexit' for
now, and a a later patch in this series will then clean up the
redundancy.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
109 lines
2.3 KiB
Bash
Executable File
109 lines
2.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git p4 transparency to shell metachars in filenames'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'init depot' '
|
|
(
|
|
cd "$cli" &&
|
|
echo file1 >file1 &&
|
|
p4 add file1 &&
|
|
p4 submit -d "file1"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'shell metachars in filenames' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEditCheck true &&
|
|
echo f1 >foo\$bar &&
|
|
git add foo\$bar &&
|
|
echo f2 >"file with spaces" &&
|
|
git add "file with spaces" &&
|
|
git commit -m "add files" &&
|
|
P4EDITOR="test-tool chmtime +5" git p4 submit
|
|
) &&
|
|
(
|
|
cd "$cli" &&
|
|
p4 sync ... &&
|
|
test -e "file with spaces" &&
|
|
test -e "foo\$bar"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'deleting with shell metachars' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEditCheck true &&
|
|
git rm foo\$bar &&
|
|
git rm file\ with\ spaces &&
|
|
git commit -m "remove files" &&
|
|
P4EDITOR="test-tool chmtime +5" git p4 submit
|
|
) &&
|
|
(
|
|
cd "$cli" &&
|
|
p4 sync ... &&
|
|
test ! -e "file with spaces" &&
|
|
test ! -e foo\$bar
|
|
)
|
|
'
|
|
|
|
# Create a branch with a shell metachar in its name
|
|
#
|
|
# 1. //depot/main
|
|
# 2. //depot/branch$3
|
|
|
|
test_expect_success 'branch with shell char' '
|
|
test_when_finished cleanup_git &&
|
|
test_create_repo "$git" &&
|
|
(
|
|
cd "$cli" &&
|
|
|
|
mkdir -p main &&
|
|
|
|
echo f1 >main/f1 &&
|
|
p4 add main/f1 &&
|
|
p4 submit -d "main/f1" &&
|
|
|
|
p4 integrate //depot/main/... //depot/branch\$3/... &&
|
|
p4 submit -d "integrate main to branch\$3" &&
|
|
|
|
echo f1 >branch\$3/shell_char_branch_file &&
|
|
p4 add branch\$3/shell_char_branch_file &&
|
|
p4 submit -d "branch\$3/shell_char_branch_file" &&
|
|
|
|
p4 branch -i <<-EOF &&
|
|
Branch: branch\$3
|
|
View: //depot/main/... //depot/branch\$3/...
|
|
EOF
|
|
|
|
p4 edit main/f1 &&
|
|
echo "a change" >> main/f1 &&
|
|
p4 submit -d "a change" main/f1 &&
|
|
|
|
p4 integrate -b branch\$3 &&
|
|
p4 resolve -am branch\$3/... &&
|
|
p4 submit -d "integrate main to branch\$3" &&
|
|
|
|
cd "$git" &&
|
|
|
|
git config git-p4.branchList main:branch\$3 &&
|
|
git p4 clone --dest=. --detect-branches //depot@all &&
|
|
git log --all --graph --decorate --stat &&
|
|
git reset --hard p4/depot/branch\$3 &&
|
|
test -f shell_char_branch_file &&
|
|
test -f f1
|
|
)
|
|
'
|
|
|
|
test_done
|