Skip to main content

Module resolve_undo

Module resolve_undo 

Source
Expand description

Git index REUC (resolve-undo) extension — records unmerged stages when a conflict is resolved.

Format matches Git’s resolve-undo.c: for each path, NUL-terminated name, three octal modes with NUL terminators, then raw SHA-1s for non-zero modes.

Structs§

ResolveUndoRecord
Per-path undo data: up to three conflict stages (index 0 = stage 1).

Functions§

parse_resolve_undo_payload
Parse the REUC extension payload into a path → record map.
record_resolve_undo_for_entry
Merge one unmerged index entry into the resolve-undo map for its path.
write_resolve_undo_payload
Serialise resolve-undo records to the REUC extension body (sorted by path).