Fixes for M-02 to M-14, G-01 to G-14, K-02 to K-04, X-04 to X-14, not yet reviewed

Committed before review so Windows and WSL builds can start.
Each fix was tested and mutation-checked here; the codex review
of each item is still to come, so tasks/BUGS.md stays unticked.

M-02 is mid-review: round 1 findings are fixed (apps/ely-mark/src/tally.rs).
K-01 stays deferred. The ElyMark window test mark-outside.sh failed
once at its crash-recovery step in the last run; not yet looked into.
This commit is contained in:
ZacharyZhang-NY committed 2026-10-10 02:29:19 -04:00
1 parent 6505f35669
commit d59159cea2
75 files changed
+1482 -354

No files matched your search

+15 -1
View File
@@ -10,6 +10,8 @@ pub enum Op {
Rebase,
CherryPick,
Revert,
/// `git am`, applying mailed patches.
Am,
}
impl Op {
@@ -20,6 +22,7 @@ impl Op {
Op::Rebase => "rebase",
Op::CherryPick => "cherry-pick",
Op::Revert => "revert",
Op::Am => "am",
}
}
@@ -78,7 +81,18 @@ pub fn doing(git: &Git, root: &Path, git_dir: &Path) -> io::Result<Option<Doing>
let read = |name: &str| {
std::fs::read_to_string(git_dir.join(name)).map(|text| text.trim().to_string())
};
let doing = if has("rebase-merge") || has("rebase-apply") {
// `git am` keeps rebase-apply too, without an onto.
let doing = if has("rebase-apply/applying") {
Doing {
op: Op::Am,
ours: head(git, root)?,
theirs: format!(
"{}/{}",
read("rebase-apply/next")?,
read("rebase-apply/last")?
),
}
} else if has("rebase-merge") || has("rebase-apply") {
let dir = if has("rebase-merge") {
"rebase-merge"
} else {