Skip to main content

Module combined_tree_diff

Module combined_tree_diff 

Source
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§

CombinedDiffPath
One path in a combined diff: merge result tree vs each parent tree.
CombinedParentSide
One parent’s contribution at a combined-diff path.
CombinedTreeDiffOptions
Options for the multitree walk.

Enums§

CombinedParentStatus
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 parents are already tree OIDs (plumbing git diff --cc with 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).