From: Derrick Stolee <dstolee@xxxxxxxxxxxxx> Octopus merges require an extra chunk of data in the commit-graph file format. Create a test that ensures the new --split option continues to work with an octopus merge. Specifically, ensure that the octopus merge has parents across layers to truly check that our graph position logic holds up correctly. Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> --- t/t5324-split-commit-graph.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh index e8df35c30b..704def70bb 100755 --- a/t/t5324-split-commit-graph.sh +++ b/t/t5324-split-commit-graph.sh @@ -290,4 +290,15 @@ test_expect_success 'verify after commit-graph-chain corruption' ' ) ' +test_expect_success 'add octopus merge' ' + git reset --hard commits/10 && + git merge commits/3 commits/4 && + git branch merge/octopus && + git commit-graph write --reachable --split && + git commit-graph verify && + test_line_count = 3 $graphdir/commit-graph-chain +' + +graph_git_behavior 'graph exists' merge/octopus commits/12 + test_done -- gitgitgadget
