diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-08-08 14:26:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-08 14:26:09 -0700 |
| commit | 3bcedae27ea2af2e3895d92d6525231e350c91be (patch) | |
| tree | 9bf2247236869d3f41bbd0b9a2df746fcc2ecf66 /t | |
| parent | Git 2.23-rc1 (diff) | |
| parent | commit-graph: fix bug around octopus merges (diff) | |
| download | tgif-3bcedae27ea2af2e3895d92d6525231e350c91be.tar.xz | |
Merge branch 'ds/commit-graph-octopus-fix'
commit-graph did not handle commits with more than two parents
correctly, which has been corrected.
* ds/commit-graph-octopus-fix:
commit-graph: fix bug around octopus merges
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5324-split-commit-graph.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh index 03f45a1ed9..99f4ef4c19 100755 --- a/t/t5324-split-commit-graph.sh +++ b/t/t5324-split-commit-graph.sh @@ -319,7 +319,9 @@ test_expect_success 'add octopus merge' ' git merge commits/3 commits/4 && git branch merge/octopus && git commit-graph write --reachable --split && - git commit-graph verify && + git commit-graph verify 2>err && + test_line_count = 3 err && + test_i18ngrep ! warning err && test_line_count = 3 $graphdir/commit-graph-chain ' |