npub1sh4dwqc9ypguemh6m8tmxxl8xuzfsz0j8av8vq7t3xd3mldsg9ls4ew80h/ngit-cli-mirror/src/lib/git/mod.rs, branch v2.2.0Personal mirror of DanConwayDev/ngit-cli on git.upleb.uk
https://upleb.uk/npub1sh4dwqc9ypguemh6m8tmxxl8xuzfsz0j8av8vq7t3xd3mldsg9ls4ew80h/ngit-cli-mirror/atom?h=v2.2.02026-02-18T21:17:41+00:00fix: thread applied OID through patch chain correctly2026-02-18T21:17:41+00:00DanConwayDevDanConwayDev@protonmail.com2026-02-18T21:17:41+00:00urn:sha1:09db17fd719ddd42c5afad24e1a8e71735374f8e
When applying a chain of patches without parent-commit tags, each
patch's parent was resolved independently, meaning patch2 would not
parent off the OID patch1 actually produced. Thread next_parent_override
through the loop and guard the early-return in create_commit_from_patch
so the override is always honoured.
fix: harden apply_patch_chain when optional patch tags absent2026-02-18T21:04:59+00:00DanConwayDevDanConwayDev@protonmail.com2026-02-18T21:04:59+00:00urn:sha1:73d829b916d87626f33ea2adead0c48f1d9d737d
- Replace .unwrap() calls in filter closure with pattern-let guards
so a missing/invalid mbox commit id conservatively includes the patch
- Use the OID returned by create_commit_from_patch as branch tip instead
of the tag commit id, which may differ for GPG-signed commits
- Add module-level doc comment to mbox_parser explaining design rationale
and known limitations around the mbox envelope SHA1
feat: handle missing optional patch tags for pr/ flow2026-02-18T14:48:20+00:00DanConwayDevDanConwayDev@protonmail.com2026-02-18T14:48:20+00:00urn:sha1:fcff4541e1f36b6575596c353637b25aeae9bdcf
- Add mbox_parser module to extract metadata from patch content
- Extract author/committer from From: and Date: headers when tags missing
- Extract commit message body as fallback for description tag
- Implement best-guess parent commit logic using committer timestamps
- Update patch_supports_commit_ids to accept mbox-parseable patches
- Enable patches without optional tags to appear as pr/ branches
fix: handle existing local branch that is behind when checking out PR2026-02-12T16:19:29+00:00DanConwayDevDanConwayDev@protonmail.com2026-02-12T16:19:29+00:00urn:sha1:1be46b4fd7a78ce418765ef5467823b7ea5e60eb
When a PR branch already exists locally, the previous code would silently
move the branch pointer without checking for tracking or fast-forward safety.
Now:
- If branch has tracking: checkout and warn user to git pull
- If no tracking and fast-forward: safely move pointer
- If no tracking and diverged: show copy-paste commands for reset/rebase
- If commit not found locally: suggest fetching
Uses console crate for yellow output instead of hardcoded ANSI codes.
chore: cargo update2025-10-17T14:16:03+00:00DanConwayDevDanConwayDev@protonmail.com2025-10-17T14:02:53+00:00urn:sha1:709946c1b49114b71d3080bb8d97e63525f40fd9
update patches ahead of wider upgrade. clippy required some autofixes
feat(send): add `merge-base` tag to PR (Update)2025-10-17T09:20:43+00:00DanConwayDevDanConwayDev@protonmail.com2025-10-17T08:30:35+00:00urn:sha1:2bf98e91e5b5a7d1b18557e65711b5ef3d1a54a3
following its inclusion in the NIP-34 spec
refactor: move patch size evaluation fn to lib2025-08-01T08:39:36+00:00DanConwayDevDanConwayDev@protonmail.com2025-08-01T08:39:36+00:00urn:sha1:a625be66cfbced5f96cb0123a286937543e7273c
so we can use it in ngit as well as remote helper
fix(list): improve pr unsupport text2025-07-25T15:11:01+00:00DanConwayDevDanConwayDev@protonmail.com2025-07-25T14:52:19+00:00urn:sha1:0cad465dd3f78bd6c680067d12d396d4782829bf
and show a more helpful message when proposal can be checked out
using the remote
chore: bump nightly rustfmt2025-07-16T09:59:20+00:00DanConwayDevDanConwayDev@protonmail.com2025-07-16T09:59:20+00:00urn:sha1:ac53bca7e315848864ff9e51703720b5b466bc42
to latest available and apply fmt fixes
chore: nix flake update2025-07-16T09:39:35+00:00DanConwayDevDanConwayDev@protonmail.com2025-07-16T09:10:41+00:00urn:sha1:092b9606ff2b721d858a5c7b2b27a2f9942b4bc4
required running:
`cargo fix --allow-dirty --allow-staged`
`cargo clippy --fix --allow-dirty -- -D warnings`
to fix problems
and then manually fixing some too