Expand description
Multi-parent combined tree diff (Git diff_tree_paths / find_paths_multitree).
Implements the D(T,P1...Pn) walk from tree-diff.c for merge commits, producing
per-path parent status letters used by git diff-tree -c --name-status and
--find-object filtering (combined_objfind in combine-diff.c).
Structs§
- Combined
Diff Path - One path in a combined diff: merge result tree vs each parent tree.
- Combined
Parent Side - One parent’s contribution at a combined-diff path.
- Combined
Tree Diff Options - Options for the multitree walk.
Enums§
- Combined
Parent Status - Per-parent coarse status in a combined diff (
A/M/D).
Functions§
- combined_
diff_ paths_ filtered - Build combined-diff paths for a merge commit’s tree against each parent’s tree.
- combined_
diff_ paths_ trees - Combined diff paths when
parentsare already tree OIDs (plumbinggit diff --ccwith N+1 trees). - combined_
parent_ status_ char - One character per parent for raw / name-status combined output (
A/M/D). - format_
combined_ raw_ line - Git raw combined line (
::::modes... oids... MM\tpath).