Add Merge Support for `octopus` Strategy#7129

Open

jar-of-salt wants to merge 34 commits intolibgit2:mainfrom

jar-of-salt:merge-octopus

Commits on Sep 16, 2025

merge octopus: add test cases for simple, complex, and failure octopus merges

jar-of-salt
authored and
Sam Altier
committed
merge octopus: add test repos for octopus merge

jar-of-salt
authored and
Sam Altier
committed
merge octopus: update repo path in path in test resources

jar-of-salt
authored and
Sam Altier
committed
merge octopus: add octopus base computation

jar-of-salt
authored and
Sam Altier
committed
merge octopus: add 'merge_annotated_commits_octopus'

jar-of-salt
authored and
Sam Altier
committed
merge octopus: add octopinitial octopus merge logic

jar-of-salt
authored and
Sam Altier
committed
merge octopus: fix some issues with obtaining trees; fix seg fault; prepare to implement aggressive merge

jar-of-salt
authored and
Sam Altier
committed
merge octopus: fix merge base calculation

jar-of-salt
authored and
Sam Altier
committed
merge octopus: remove references to aggressive merge strategy

jar-of-salt
authored and
Sam Altier
committed
merge octopus: fix compiler warnings

jar-of-salt
authored and
Sam Altier
committed
merge octopus: use in-memory indexes only for octopus steps

jar-of-salt
authored and
Sam Altier
committed
merge octopus: break octopus logic into fastforward and simple merge components

jar-of-salt
authored and
Sam Altier
committed
merge octopus: remove spaces

jar-of-salt
authored and
Sam Altier
committed
merge octopus: update git repo for test case complex

jar-of-salt
authored and
Sam Altier
committed
merge octopus: add credit to Junio C Hamano; remove TODOs

jar-of-salt
authored and
Sam Altier
committed
merge octopus: remove TODOs related to octopus

jar-of-salt
authored and
Sam Altier
committed
merge octopus: resolve further octopus-related todos

jar-of-salt
authored and
Sam Altier
committed
merge octopus: convert simple test to use same repo as complex test

jar-of-salt
authored and
Sam Altier
committed
merge octopus: rename merge-octopus-complex resource to merge-octopus

jar-of-salt
authored and
Sam Altier
committed
merge octopus: remove unused simple octopus repo

jar-of-salt
authored and
Sam Altier
committed
merge octopus: remove merge octopus fail repo in favor of common repo

jar-of-salt
authored and
Sam Altier
committed
merge octopus: add standard test repo

jar-of-salt
authored and
Sam Altier
committed
merge octopus: convert tests to use common octopus test repo; change fail.c -> conflict.c to more clearly indicate what the test is for

jar-of-salt
authored and
Sam Altier
committed
merge octopus: remove unnecessary hooks files from test repo
jar-of-salt
committed
merge octopus: remove unnecessary exclude file from test repo
jar-of-salt
committed
merge octopus: update 'git_merge' documentation to reflect octopus functionality
jar-of-salt
committed
merge octopus: add todo for automatic merge
jar-of-salt
committed
merge octopus: add fastforwardable branch
jar-of-salt
committed
merge octopus: fix fastforward logic to work with an in-memory index
jar-of-salt
committed
merge octopus: fix conflict and ff/skip test cases
jar-of-salt
committed
merge octopus: add fastforward-able branch and skippable branch
jar-of-salt
committed
merge octopus: cleanup formatting;\nclarify comments on octopus behavior
jar-of-salt
committed
merge octopus: add explanatory git log graph for complex test case
jar-of-salt
committed

Commits on Sep 21, 2025

merge octopus: update comment RE automatic merge on octopus
jar-of-salt
committed