mirror of
https://github.com/git/git.git
synced 2024-05-21 15:06:31 +02:00
58c8bc7c1a
When an explicit list of changes is given, it makes no sense to use @all or @3,5 or any of the other p4 revision specifiers. Make the code notice when this happens, instead of just ignoring --changesfile. Test it. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
69 lines
1.4 KiB
Bash
Executable File
69 lines
1.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git-p4 options'
|
|
|
|
. ./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" &&
|
|
echo file3 >file3 &&
|
|
p4 add file3 &&
|
|
p4 submit -d "change 3"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone no --git-dir' '
|
|
test_must_fail "$GITP4" clone --git-dir=xx //depot
|
|
'
|
|
|
|
test_expect_success 'clone --branch' '
|
|
"$GITP4" clone --branch=refs/remotes/p4/sb --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git ls-files >files &&
|
|
test_line_count = 0 files &&
|
|
test_path_is_file .git/refs/remotes/p4/sb
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone --changesfile' '
|
|
cf="$TRASH_DIRECTORY/cf" &&
|
|
test_when_finished "rm \"$cf\"" &&
|
|
printf "1\n3\n" >"$cf" &&
|
|
"$GITP4" clone --changesfile="$cf" --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git log --oneline p4/master >lines &&
|
|
test_line_count = 2 lines
|
|
test_path_is_file file1 &&
|
|
test_path_is_missing file2 &&
|
|
test_path_is_file file3
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone --changesfile, @all' '
|
|
cf="$TRASH_DIRECTORY/cf" &&
|
|
test_when_finished "rm \"$cf\"" &&
|
|
printf "1\n3\n" >"$cf" &&
|
|
test_must_fail "$GITP4" clone --changesfile="$cf" --dest="$git" //depot@all
|
|
'
|
|
|
|
test_expect_success 'kill p4d' '
|
|
kill_p4d
|
|
'
|
|
|
|
test_done
|