64d1022e14
Add missing spaces before '&&' and switch tabs around '&&' to spaces. Also fix the space after redirection operator in t3701 while we're here. These issues were found using `git grep '[^ ]&&$'` and `git grep -P '&&\t' t/`. Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
100 lines
1.8 KiB
Bash
Executable File
100 lines
1.8 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git p4 with server triggers'
|
|
|
|
. ./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 "change 1" &&
|
|
echo file2 >file2 &&
|
|
p4 add file2 &&
|
|
p4 submit -d "change 2"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone with extra info lines from verbose p4 trigger' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
p4 triggers -i <<-EOF
|
|
Triggers: p4triggertest-command command pre-user-change "echo verbose trigger"
|
|
EOF
|
|
) &&
|
|
(
|
|
p4 change -o | grep -s "verbose trigger"
|
|
) &&
|
|
git p4 clone --dest="$git" //depot/@all &&
|
|
(
|
|
p4 triggers -i <<-EOF
|
|
Triggers:
|
|
EOF
|
|
)
|
|
'
|
|
|
|
test_expect_success 'import with extra info lines from verbose p4 trigger' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$cli" &&
|
|
echo file3 >file3 &&
|
|
p4 add file3 &&
|
|
p4 submit -d "change 3"
|
|
) &&
|
|
(
|
|
p4 triggers -i <<-EOF
|
|
Triggers: p4triggertest-command command pre-user-describe "echo verbose trigger"
|
|
EOF
|
|
) &&
|
|
(
|
|
p4 describe 1 | grep -s "verbose trigger"
|
|
) &&
|
|
git p4 clone --dest="$git" //depot/@all &&
|
|
(
|
|
cd "$git" &&
|
|
git p4 sync
|
|
) &&
|
|
(
|
|
p4 triggers -i <<-EOF
|
|
Triggers:
|
|
EOF
|
|
)
|
|
'
|
|
|
|
test_expect_success 'submit description with extra info lines from verbose p4 change trigger' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
p4 triggers -i <<-EOF
|
|
Triggers: p4triggertest-command command pre-user-change "echo verbose trigger"
|
|
EOF
|
|
) &&
|
|
(
|
|
p4 change -o | grep -s "verbose trigger"
|
|
) &&
|
|
git p4 clone --dest="$git" //depot &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEdit true &&
|
|
echo file4 >file4 &&
|
|
git add file4 &&
|
|
git commit -m file4 &&
|
|
git p4 submit
|
|
) &&
|
|
(
|
|
p4 triggers -i <<-EOF
|
|
Triggers:
|
|
EOF
|
|
) &&
|
|
(
|
|
cd "$cli" &&
|
|
test_path_is_file file4
|
|
)
|
|
'
|
|
|
|
test_done
|