From c3ab08844c30f85342622fef1e4cf1ef1bb2bcd0 Mon Sep 17 00:00:00 2001 From: Joachim Kuebart Date: Wed, 5 May 2021 11:56:25 +0000 Subject: 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 Signed-off-by: Junio C Hamano diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index 56e6469..0d3520f 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 && -- cgit v0.10.2-6-g49f6