diff options
| author |  Joachim Kuebart <joachim.kuebart@gmail.com> | 2021-05-05 11:56:25 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-05-06 12:51:31 +0900 |
| commit | c3ab08844c30f85342622fef1e4cf1ef1bb2bcd0 (patch) | |
| tree | 5998814333f486b364fedc78aa29477b6bbc7c1f | |
| parent | Git 2.31.1 (diff) | |
| download | tgif-c3ab08844c30f85342622fef1e4cf1ef1bb2bcd0.tar.xz | |
git-p4: ensure complex branches are cloned correctly
When importing a branch from p4, git-p4 searches the history of the parent
branch for the branch point. The test for the complex branch structure
ensures all files have the expected contents, but doesn't examine the
branch structure.
Check for the correct branch structure by making sure that the initial
commit on each branch is empty. This ensures that the initial commit's
parent is indeed the correct branch-off point.
Signed-off-by: Joachim Kuebart <joachim.kuebart@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t9801-git-p4-branch.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index 56e64697a8..0d3520f577 100755 --- a/t/t9801-git-p4-branch.sh +++ b/t/t9801-git-p4-branch.sh @@ -294,11 +294,13 @@ test_expect_success 'git p4 clone complex branches' ' test_path_is_file file3 && grep update file2 && git reset --hard p4/depot/branch4 && + git diff-tree --quiet HEAD && test_path_is_file file1 && test_path_is_file file2 && test_path_is_missing file3 && ! grep update file2 && git reset --hard p4/depot/branch5 && + git diff-tree --quiet HEAD && test_path_is_file file1 && test_path_is_file file2 && test_path_is_file file3 && |