| commit | e2017c48fe95d44f95bc4e9f36e2210dff698c40 | |
| author | Derrick Stolee <dstolee@microsoft.com> | |
| Tue, 18 Jun 2019 18:14:34 +0000 (18 11:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 20 Jun 2019 03:46:26 +0000 (19 20:46 -0700) | ||
| tree | 3efeddbb52b88e08af4c03741e37f0bffc0eedaa | treesnapshot (tar.gz zip) |
| parent | ba41112a6331e8b454cac6cfd3ee67ae93957a2c | commitdiff |
commit-graph: test octopus merges with --split
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@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t5324-split-commit-graph.sh | diffblobblamehistory |