4 repos · 27 commands · 4 broken · 6 slow · 5 filed
Exercised merge (ff, --no-ff, --squash, --no-commit, conflicts, --check/--dry-run, unrelated histories), rebase (--onto, conflicts, continue/skip/abort, -X, --exec), pick, revert, reset (soft/mixed/hard/keep), tags and the history subcommands on scratch repos, rust-lang/cargo and git/git, comparing results against git 2.43 (trees/fsck identical in every comparable case). Correctness is generally good and git/grit interop of conflict states mostly works, but main (v0.5.29) does not compile, `pick`/`revert --abort` on a git-started cherry-pick leaves a conflicted index, pick/revert/rebase refuse detached HEAD, and pick ranges and far-base rebases are several times slower than git.
| repo | files | commits | .git | notes |
|---|---|---|---|---|
| octocat/Hello-World | 1 | 3 | 1 MB | cloned, only used to confirm clone/basic ops |
| rust-lang/cargo | 3,078 | 23,615 | 81 MB | |
| git/git | 4,863 | 82,668 | 326 MB | plus synthetic 300-commit branches lin/lin2 (new files per commit) from v2.40.0 |
| scratch s1..s12 + repro1/2 | 10 | 10 | 1 MB | tiny repos under /tmp/dogfood for workflow/interop testing |
| command | repo | grit | git | grit/git | result | notes |
|---|---|---|---|---|---|---|
| grit reset --hard <P1> (git master -> merge parent) | git/git | 50 ms | 60 ms | 0.8× | ok | |
| grit merge <P2> (true merge, 1149-commit side, clean) | git/git | 180 ms | 210 ms | 0.9× | ok | tree identical to upstream merge commit |
| grit merge v2.45.4 into v2.46.0 (15 unmerged entries) | git/git | 100 ms | 210 ms | 0.5× | ok | same index; one hunk's blank-line placement differs from git |
| grit merge --abort | git/git | 30 ms | 90 ms | 0.3× | ok | |
| grit merge --check v2.45.4 | git/git | 70 ms | — | — | ok | |
| grit rebase --onto v2.46.0 v2.40.0 (300 commits, conflicting appends) | git/git | 7.01 s | 2.79 s | 2.5× | slow | hyperfine; 2.5x; same tree. Related to #2531 |
| grit rebase --onto v2.46.0 lin2~300 (300 independent commits) | git/git | 1.86 s | 2.69 s | 0.7× | ok | faster than git, but memory 2.6x |
| grit rebase --onto v2.46.0 lin2~1 (1 commit) | git/git | 1.71 s | 490 ms | 3.5× | slow | #2531 |
| grit rebase --onto master~50 master~600 (1129 commits incl. merges) | git/git | 3.49 s | 520 ms | 6.7× | wrong | not comparable: grit replays merge commits (stops on a conflict at commit 277), git linearizes and stops at first pick; design difference |
| grit pick v2.40.0..lin2 (300 commits) | git/git | 11.13 s | 1.59 s | 7.0× | slow | #2532, 7x |
| grit pick lin2~100..lin2 | git/git | 4.02 s | 490 ms | 8.2× | slow | #2532, 8x |
| grit revert v2.46.0..HEAD (300 commits) | git/git | 1.72 s | 1.36 s | 1.3× | ok | |
| grit tag (1012 tags) | git/git | 0.0 ms | 0.0 ms | — | ok | |
| grit tag --contains v2.30.0 | git/git | 50 ms | 20 ms | 2.5× | ok | |
| grit describe | git/git | 120 ms | 10 ms | 12× | ok | 120 ms vs 10 ms, 110 ms slower than git on a 82k-commit repo (marginal; not filed). Distance differs from git's (425 vs 431) because git's describe depth is approximate; grit matches rev-list --count |
| grit reset --hard HEAD~3000 | git/git | 320 ms | 290 ms | 1.1× | ok | |
| grit reset --soft HEAD~50 | git/git | 30 ms | 0.0 ms | — | ok | |
| grit rebase --onto master HEAD~1 (1 commit, 6.8k upstream commits) | rust-lang/cargo | 864 ms | 306 ms | 2.8× | slow | hyperfine 8 runs; 2.8x, #2531 |
| grit pick master~2000..lc (100 new-file commits) | rust-lang/cargo | 12.63 s | 930 ms | 14× | slow | 13.6x, #2532 |
| grit pick lc (1 commit) | rust-lang/cargo | 170 ms | 20 ms | 8.5× | ok | 170 vs 20 ms, same cause as #2532 |
| grit reset --hard origin/master (from HEAD~2000) | rust-lang/cargo | 175 ms | 127 ms | 1.4× | ok | hyperfine; 48 ms slower, just under threshold, not filed |
| grit merge <merge^2> (true merge) | rust-lang/cargo | 30 ms | 90 ms | 0.3× | ok | tree identical |
| grit tag / switch -c | rust-lang/cargo | 0.0 ms | 0.0 ms | — | ok | |
| grit rebase / merge / pick / revert / reset / tag / history drop|move|reword|fixup|squash|undo (+ --json/--markdown) | scratch s1..s12 | — | — | — | ok | outputs well-formed; fsck clean; change-ids preserved across history rewrites |
| grit pick --abort after git cherry-pick conflict (ORIG_HEAD present) | scratch repro1 | — | — | — | wrong | #2529 |
| grit pick/revert/rebase on detached HEAD | scratch s5 | — | — | — | error | #2530; git works |
| cargo build --release -p grit-cli (main 8cb4162ac) | grit | — | — | — | error | #2528 |