Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support Multiple branch merge #7125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 42 commits into
base: main
Choose a base branch
from
Draft

Support Multiple branch merge #7125

Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
7fd521d
merge: add test case repository for multiple ref ('octopus') merge
jar-of-salt Sep 3, 2025
359fbfa
merge: Remove unnecessary hooks files
jar-of-salt Sep 3, 2025
c1d0895
merge octopus: add repo for testing octopus merge
jar-of-salt Sep 3, 2025
9ccd6aa
merge octopus: add initial failing test for the octopus merge feature
jar-of-salt Sep 3, 2025
ab94b67
merge octopus: setup failing test prior to merge octopus work
jar-of-salt Sep 3, 2025
1ccc258
merge octopus: enabling low-level support for multiple index joining
jar-of-salt Sep 4, 2025
cfd1f41
merge octopus: rewrite to use function that accepts multiple iterators
jar-of-salt Sep 4, 2025
c9c842a
merge octopus: create git_merge__iterators that allows multiple iter…
jar-of-salt Sep 5, 2025
9a96b06
merge octopus: create to support octopus merge
jar-of-salt Sep 5, 2025
9fa5c7f
merge octopus: fix initial test to accurately reflect goal repository…
jar-of-salt Sep 7, 2025
fe3ab54
merge octopus: enable multiple merge conflicts to be inserted for oct…
jar-of-salt Sep 7, 2025
77ae254
merge octopus: set to fail on merge conflict for octopus merge
jar-of-salt Sep 8, 2025
720ebca
merge octopus: set to fail on file merge conflict for octopus merge
jar-of-salt Sep 8, 2025
80e3d15
merge octopus: add todo for test case
jar-of-salt Sep 8, 2025
d7e5cb2
merge octopus: add missing semicolon
jar-of-salt Sep 8, 2025
b03ba10
merge octopus: disallow merge conflicts; clean up octopus-specific er…
jar-of-salt Sep 8, 2025
176ce1f
merge octopus: revert changes to queue difference (it was working for…
jar-of-salt Sep 9, 2025
f837350
merge octopus: update basic merge octopus test case
jar-of-salt Sep 9, 2025
82366b2
merge octopus: move octopus test to its own directory
jar-of-salt Sep 9, 2025
174bcd0
merge octopus: handle resetting iterators for octopus comparison
jar-of-salt Sep 10, 2025
43f4085
merge octopus: add failure test repo
jar-of-salt Sep 10, 2025
14c7ed8
merge octopus: add failure test case
jar-of-salt Sep 10, 2025
5988753
merge octopus: clean up octopus failure test
jar-of-salt Sep 10, 2025
9bc84be
merge octopus: remove unused functions, fix some warnings
jar-of-salt Sep 10, 2025
9512a07
merge octopus: update 'git_merge_diff_list__find_differences' to acce…
jar-of-salt Sep 10, 2025
1a1f479
merge octopus: use tabs!
jar-of-salt Sep 10, 2025
5f83bd6
merge octopus: fix formatting mistakes
jar-of-salt Sep 10, 2025
6a70f8a
merge octopus: update 'git_merge__iterators' to take multiple 'theirs…
jar-of-salt Sep 10, 2025
6f991b8
merge octopus: update 'git_merge_diff_list__find_differences' and 'gi…
jar-of-salt Sep 10, 2025
f7e58c0
merge octopus: update calls to 'git_merge__iterators' to reflect new …
jar-of-salt Sep 10, 2025
1865474
merge octopus: remove unused function from test
jar-of-salt Sep 10, 2025
a7d1b7d
merge octopus: update function call to match new signature
jar-of-salt Sep 10, 2025
a7beb3b
merge octopus: remove resolved TODOs
jar-of-salt Sep 10, 2025
86b370c
merge octopus: cast type in call to 'iterator_for_annotated_commit' t…
jar-of-salt Sep 10, 2025
4ac905b
merge octopus: clean up unnecessary git files for octopus test resources
jar-of-salt Sep 10, 2025
73cd43a
merge octopus: add explanatory comment regarding iterator resets in '…
jar-of-salt Sep 10, 2025
77003bd
merge octopus: add free for 'theirs' iterators in 'git_merge__iterators'
jar-of-salt Sep 10, 2025
6e2ffda
merge octopus: update 'merge_annotated_commits' to support multiple '…
jar-of-salt Sep 10, 2025
34c8fa4
merge octopus: revert unnecessary fssary format edits
jar-of-salt Sep 10, 2025
793fe9d
merge octopus: revert unnecessary format edits
jar-of-salt Sep 10, 2025
f59ea8e
merge octopus: remove complete TODOs
jar-of-salt Sep 10, 2025
9273c3b
merge octopus: correct merge base calculation for octopus case
jar-of-salt Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge octopus: add explanatory comment regarding iterator resets in '… 
…git_merge_diff_list__find_differences'
  • Loading branch information
@jar-of-salt
jar-of-salt committed Sep 10, 2025
commit 73cd43a4e8047a54d93c4cca76a71bb26e85cf89
1 change: 1 addition & 0 deletions src/libgit2/merge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1856,6 +1856,7 @@ int git_merge_diff_list__find_differences(
git_iterator_reset(ancestor_iter);
/* Reset the "ours" iterator since it may have previously been walked. */
git_iterator_reset(iterators[i]);
/* "theirs" will get reset once it takes the "ours" spot on the next loop */

curr_iterators[0] = ancestor_iter;
curr_iterators[1] = iterators[i];
Expand Down