upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src/lib/mod.rs
diff options
context:
space:
mode:
authorDanConwayDev <DanConwayDev@protonmail.com>2026-03-30 11:43:55 +0000
committerDanConwayDev <DanConwayDev@protonmail.com>2026-03-30 16:29:22 +0000
commite3276e74bc45cb4fb8f158b8249bee3d12a0805f (patch)
treecbf4531b6e85eb1cc3e75a36ec058fe2f83d75f3 /src/lib/mod.rs
parent33a72aa745ea6b6594bacfb71ea8ff2778f9b748 (diff)
fix(patch): accept reconstructed OID when commit id mismatch occurs
When applying a patch, if the reconstructed commit OID doesn't match the tagged commit id (after the existing amend attempt), accept the reconstructed OID rather than erroring. The diff is applied correctly regardless of the mismatch; apply_patch_chain already threads the actual OID forward via next_parent_override so the chain remains consistent. Mismatches can occur for several reasons: GPG-signed commits where libgit2's commit_create_buffer produces subtly different bytes than the original git commit, patches produced with non-standard tooling, or edge cases like the diff.noprefix issue fixed in 7a36aed.
Diffstat (limited to 'src/lib/mod.rs')
0 files changed, 0 insertions, 0 deletions