grit://cooking/dogfood← what’s cooking
Tuesday, November 10, 2026 · macOS 15.7 (Darwin 24.6.0)

Dogfood on scott-mbp: Newcomer

4 repos · 22 commands · 5 broken · 2 slow · 4 filed

Newcomer session on scott-mbp (macOS arm64) against main 41d768c81 built from source. I re-checked the 6 fixed issues (2568, 2569, 2570 fixed; 2574 and 2390 still reproduce; 2563 is Windows-only). I then went deeper on APFS collision handling, conflict flows (pull --rebase, pick, merge, stash pop), unreadable/read-only paths, 8-way concurrent serve checkout/checkin/integrate and a first library program. Beginner-facing errors and hints are very good and the conflict flows match git, but the APFS case/normalization collision paths still have real data-integrity bugs (#2575, #2576) and stash show leaks raw control bytes (#2580).

os
macOS 15.7 (Darwin 24.6.0) · arm64
machine
scott-mbp (self-hosted worker), Apple M3, 8 cores, 24 GB RAM, APFS case-insensitive
versions
grit 0.5.0 on PATH (no restore command; used only for comparison) · main 41d768c8 · git 2.52.0 (Homebrew)
repositories4
repofilescommits.gitnotes
octocat/Hello-World131 MB
git/git4,86682,797324 MB
gitbutlerapp/grit3,47913,544199 MBalso served via grit serve and cloned/checked out through it
scratch collision/conflict/permission repos531 MBcrash1, crash2, case-*, cf, sp, ro, ur, fn, uni, ex, pr, pd
commandsgrit vs. system git, wall time
commandrepogritgitgrit/gitresultnotes
grit statusgit/git13 ms13 ms1.0×okhyperfine, 5 runs
grit log --oneline -n 1000git/git8.8 ms10 ms0.9×ok
grit diff HEAD~100 HEADgit/git19 ms38 ms0.5×ok
grit revs --count HEADgit/git305 ms371 ms0.8×ok
grit blame builtin/log.cgit/git365 ms343 ms1.1×okno differing lines vs git
grit blame builtin/commit.c (compare to git)git/git———wrong4/1993 lines credited to merge commits (#2574 not fully fixed)
grit switch --detach <20000 commits back>git/git450 ms550 ms0.8×ok
grit switch --detach master (back)git/git400 ms550 ms0.7×ok
grit clone <local path>git/git390 ms1.04 s0.4×ok.git 324 MB both
grit clone http://127.0.0.1 (grit serve)gitbutlerapp/grit3.68 s7.63 s0.5×okgit client clone of grit serve: 7.2-7.6 s, fsck clean
grit upload-pack --stateless-rpc (4M duplicate wants)octocat/Hello-World600 ms——memory#2390 still reproduces
grit upload-pack --stateless-rpc (19M duplicate wants)octocat/Hello-World———memoryrequest buffered fully; #2390
grit restore . / restore Readme.TXT (case-colliding)scratch collision/conflict/permission repos———crash#2575
grit commit (NFC/NFD colliding tracked names)scratch collision/conflict/permission repos———wrong#2576
grit stash show (names with ESC/tab/newline)scratch collision/conflict/permission repos———wrong#2580
grit status/add/commit on case-colliding clonescratch collision/conflict/permission repos———wrongcontradictory hints, #2581
grit diff HEAD~800 HEAD --stat in blobless clone via grit servegitbutlerapp/grit1.26 s1.31 s1.0×okgrit leaves 21 packs vs git 3 (lazy fetch batching, see #2327); time equal so not filed
grit pull --rebase (2 conflicting stops) / rebase --continue / commit mid-rebasescratch collision/conflict/permission repos———ok
grit rebase main --execscratch collision/conflict/permission repos———okfailing exec leaves everything untouched; message does not say which commit failed (minor)
grit pick / merge / stash pop with dir-file and modify-delete conflictsscratch collision/conflict/permission repos———okmatches git's index state except stash pop d dir->file (no file/directory conflict reported; nothing lost)
grit checkout/checkin/integrate x8 concurrentlygitbutlerapp/grit2.19 s——okcheckout 8 in 2.2 s; 2 of 8 integrates correctly rejected with HTTP 409
grit clone --blobs none (serve with allowFilter)gitbutlerapp/grit3.96 s——ok29 MB .git vs 186 MB when the server lacks allowFilter (documented, warns)
worked9
  • ›Beginner errors and hints (nothing to commit, no remote, unknown branch/remote, bad URL, out-of-range revision) are clear and actionable
  • ›pull --rebase conflict stops, rebase --continue, commit mid-rebase, --exec and atomic failure all behave
  • ›pull refuses overwrites of dirty/untracked files with clear messages; --autostash conflict path matches git
  • ›Unreadable directories warn and continue; switch over read-only files fails atomically
  • ›File names with control bytes are quoted in status/add/diff/show/log/mv/rm/clean/markdown
  • ›grit serve handled 8 concurrent checkouts/checkins/integrates correctly, with proper 409s
  • ›Collision warning on switch/clone for case collisions
  • ›grit-lib first program compiled from rustdoc alone and produced a git-fsck-clean commit
  • ›Speed on git/git is at or better than git for status, log, diff, revs, clone
problems12
  • ›#2575 restore on case-colliding paths panics (restore .) or stages a deletion (filed)
  • ›#2576 NFC/NFD collisions unprotected; auto-stage commit rewrites a blob (filed)
  • ›#2580 stash show prints raw ESC/tab/newline in names (filed)
  • ›#2581 status/add/commit contradictory hints on case collisions (filed)
  • ›#2574 whole-file blame still credits merge commits (verify_fix not fixed)
  • ›#2390 upload-pack still buffers the whole request: 1.28 GB at 19M wants (verify_fix not fixed)
  • ›Not filed: tutorial.md output drift (diff hunk header, show format, merge message, log author) - minor docs
  • ›Not filed: clone typo'd host error leaks 'info/refs?service=git-upload-pack' and the raw 'io: failed to lookup address information' text - minor
  • ›Not filed: stash pop with upstream dir->file does not report a file/directory conflict (git does), no data loss
  • ›Not filed: lazy fetch in blobless clones leaves 21 packs vs git 3 (same time) - related to closed #2327
  • ›Not filed: grit auth blocks forever when the credential helper (osxkeychain) blocks on a keychain prompt; caused by my scratch HOME with no login keychain, git hangs identically
  • ›Not filed: `grit switch -q` is an unknown option (git habit), rebase --exec error does not name the failing commit
bugs filed4
#2575 #2576 #2580 #2581already reported: #2548 #2571 #2467 #2327
next time
  • ›Re-test #2575/#2576/#2581 once fixed, including restore -S and checkout of a tag on colliding paths
  • ›Case-colliding directories (Docs/ vs docs/) via pull and stash pop, and a case-insensitive disk image for the Linux-style comparison
  • ›grit auth device flow with osxkeychain on a real login keychain (no HOME override) and a first push to a disposable private GitHub repo
  • ›ssh with a host-key prompt on a real TTY
  • ›Run every console block of content/docs/commands against the release in a harness (only the tutorial was run here)
  • ›Windows-only fixes (#2563, #2570) on a Windows worker
  • ›Library from crates.io only (published grit-lib instead of a path dependency) with a custom CredentialProvider over Remote::fetch
  • ›Re-run the upload-pack request-memory check through grit-http-server (smart HTTP) instead of stdin