From 4af6ce56e538bb7d26436d6f24e800aa03bfd85b Mon Sep 17 00:00:00 2001 From: "prompt.ac/@jeffrey" Date: Fri, 24 Apr 2026 16:23:51 -0700 Subject: [PATCH] oven: broaden pre-rebase cleanup to repo-wide checkout The previous fix only cleaned papers/ before rebase, but the papers-git-poller rewrites .last-papers-built-hash at the repo root every cycle, leaving that file dirty and still blocking the rebase. Switch from \`git checkout -- papers/\` to \`git checkout -- .\` so the cleanup covers the whole working tree. We've already committed the PDFs we care about at this point; everything else left unstaged is either LaTeX build artifacts or poller state. --- oven/papers-builder.mjs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/oven/papers-builder.mjs b/oven/papers-builder.mjs index ef460074b8..367b01b4a4 100644 --- a/oven/papers-builder.mjs +++ b/oven/papers-builder.mjs @@ -148,13 +148,15 @@ async function commitAndPushPDFs(job) { addLogLine(job, "stdout", ` GIT: committing ${changedFiles.length} file(s)...`); await git(["commit", "-m", msg]); - // Discard any remaining unstaged build artifacts (xelatex leaves tracked - // .log/.toc/.aux/.fls files modified after each run, and intermediate .pdfs - // in papers/arxiv-*/ may also be dirty). We only commit system/public/... + - // metadata.json + BUILDLOG.md, so anything still dirty is byproduct we - // don't want to preserve — and leaving it dirty blocks `git pull --rebase`. + // Discard any remaining unstaged changes (xelatex leaves tracked + // .log/.toc/.aux/.fls files modified after each run, intermediate .pdfs + // in papers/arxiv-*/ may be dirty, and the papers-git-poller rewrites + // .last-papers-built-hash at the repo root). We only commit + // system/public/... + metadata.json + BUILDLOG.md, so anything still dirty + // is byproduct we don't want to preserve — and leaving it dirty blocks + // `git pull --rebase`. try { - await git(["checkout", "--", "papers/"]); + await git(["checkout", "--", "."]); } catch (cleanupErr) { addLogLine( job, -- 2.51.2