development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 04:53:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
git/t/t9834-git-p4-file-dir-bug.sh

72 lines
2.4 KiB
Bash
Raw Permalink Normal View History

git-p4: recover from inconsistent perforce history Perforce allows you commit files and directories with the same name, so you could have files //depot/foo and //depot/foo/bar both checked in. A p4 sync of a repository in this state fails. Deleting one of the files recovers the repository. When this happens we want git-p4 to recover in the same way as perforce. Note that Perforce has this change in their 2017.1 version: Bugs fixed in 2017.1 #1489051 (Job #2170) ** Submitting a file with the same name as an existing depot directory path (or vice versa) will now be rejected. so people hopefully will not creating damaged Perforce repos anymore, but "git p4" needs to be able to interact with already corrupt ones. Signed-off-by: Andrew Oakley <andrew@adoakley.name> Reviewed-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-05-10 10:16:50 +00:00
#!/bin/sh
test_description='git p4 directory/file bug handling
This test creates files and directories with the same name in perforce and
checks that git-p4 recovers from the error at the same time as the perforce
repository.'
t98xx: mark Perforce tests as memory-leak free All the Perforce tests are free of memory leaks. This went unnoticed because most folks do not have p4 and p4d installed on their computers. Consequently, given that the prerequisites for running those tests aren't fulfilled, `TEST_PASSES_SANITIZE_LEAK=check` won't notice that those tests are indeed memory leak free. Mark those tests accordingly. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-07-31 10:37:56 +00:00
TEST_PASSES_SANITIZE_LEAK=true
git-p4: recover from inconsistent perforce history Perforce allows you commit files and directories with the same name, so you could have files //depot/foo and //depot/foo/bar both checked in. A p4 sync of a repository in this state fails. Deleting one of the files recovers the repository. When this happens we want git-p4 to recover in the same way as perforce. Note that Perforce has this change in their 2017.1 version: Bugs fixed in 2017.1 #1489051 (Job #2170) ** Submitting a file with the same name as an existing depot directory path (or vice versa) will now be rejected. so people hopefully will not creating damaged Perforce repos anymore, but "git p4" needs to be able to interact with already corrupt ones. Signed-off-by: Andrew Oakley <andrew@adoakley.name> Reviewed-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-05-10 10:16:50 +00:00
. ./lib-git-p4.sh
test_expect_success 'start p4d' '
start_p4d &&
t9834: remove use of `test_might_fail p4` The test_must_fail() family of functions (including test_might_fail()) should only be used on git commands. Replace test_might_fail() with a compound command wrapping the old p4 invocation that always returns 0. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-07-07 06:04:37 +00:00
{ p4 configure set submit.collision.check=0 || :; }
git-p4: recover from inconsistent perforce history Perforce allows you commit files and directories with the same name, so you could have files //depot/foo and //depot/foo/bar both checked in. A p4 sync of a repository in this state fails. Deleting one of the files recovers the repository. When this happens we want git-p4 to recover in the same way as perforce. Note that Perforce has this change in their 2017.1 version: Bugs fixed in 2017.1 #1489051 (Job #2170) ** Submitting a file with the same name as an existing depot directory path (or vice versa) will now be rejected. so people hopefully will not creating damaged Perforce repos anymore, but "git p4" needs to be able to interact with already corrupt ones. Signed-off-by: Andrew Oakley <andrew@adoakley.name> Reviewed-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-05-10 10:16:50 +00:00
'
test_expect_success 'init depot' '
(
cd "$cli" &&
touch add_file_add_dir_del_file add_file_add_dir_del_dir &&
p4 add add_file_add_dir_del_file add_file_add_dir_del_dir &&
mkdir add_dir_add_file_del_file add_dir_add_file_del_dir &&
touch add_dir_add_file_del_file/file add_dir_add_file_del_dir/file &&
p4 add add_dir_add_file_del_file/file add_dir_add_file_del_dir/file &&
p4 submit -d "add initial" &&
rm -f add_file_add_dir_del_file add_file_add_dir_del_dir &&
mkdir add_file_add_dir_del_file add_file_add_dir_del_dir &&
touch add_file_add_dir_del_file/file add_file_add_dir_del_dir/file &&
p4 add add_file_add_dir_del_file/file add_file_add_dir_del_dir/file &&
rm -rf add_dir_add_file_del_file add_dir_add_file_del_dir &&
touch add_dir_add_file_del_file add_dir_add_file_del_dir &&
p4 add add_dir_add_file_del_file add_dir_add_file_del_dir &&
p4 submit -d "add conflicting" &&
p4 delete -k add_file_add_dir_del_file &&
p4 delete -k add_file_add_dir_del_dir/file &&
p4 delete -k add_dir_add_file_del_file &&
p4 delete -k add_dir_add_file_del_dir/file &&
p4 submit -d "delete conflicting" &&
p4 delete -k "add_file_add_dir_del_file/file" &&
p4 delete -k "add_file_add_dir_del_dir" &&
p4 delete -k "add_dir_add_file_del_file/file" &&
p4 delete -k "add_dir_add_file_del_dir" &&
p4 submit -d "delete remaining"
)
'
test_expect_success 'clone with git-p4' '
git p4 clone --dest="$git" //depot/@1,3
'
test_expect_success 'check contents' '
test_path_is_dir "$git/add_file_add_dir_del_file" &&
test_path_is_file "$git/add_file_add_dir_del_dir" &&
test_path_is_dir "$git/add_dir_add_file_del_file" &&
test_path_is_file "$git/add_dir_add_file_del_dir"
'
test_expect_success 'rebase and check empty' '
git -C "$git" p4 rebase &&
test_path_is_missing "$git/add_file_add_dir_del_file" &&
test_path_is_missing "$git/add_file_add_dir_del_dir" &&
test_path_is_missing "$git/add_dir_add_file_del_file" &&
test_path_is_missing "$git/add_dir_add_file_del_dir"
'
test_done
Reference in a new issue Copy permalink