]> git.ipfire.org Git - thirdparty/git.git/commit
git-p4: ensure complex branches are cloned correctly
authorJoachim Kuebart <joachim.kuebart@gmail.com>
Wed, 5 May 2021 11:56:25 +0000 (11:56 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 May 2021 03:51:31 +0000 (12:51 +0900)
commitc3ab08844c30f85342622fef1e4cf1ef1bb2bcd0
tree5998814333f486b364fedc78aa29477b6bbc7c1f
parent48bf2fa8bad054d66bd79c6ba903c89c704201f7
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>
t/t9801-git-p4-branch.sh