[PATCH v2 1/2] git-p4: ensure complex branches are cloned correctly
- From
Joachim Kuebart via GitGitGadget <gitgitgadget@gmail.com>
- Date
- May 5, 2021, 11:56 UTC
- Message-ID
- <0ee0b7b55691a8923c7fd1610adfe8854163dcfc.1620215786.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1013.v2.git.git.1620215786.gitgitgadget@gmail.com>
From: Joachim Kuebart <joachim.kuebart@gmail.com>
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> --- t/t9801-git-p4-branch.sh | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index ff94c3f17df1..50a6f8bad5c5 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 &&
-- gitgitgadget