main
1// Red test: cases where merge-ort's rename detection makes git conflict but our tree merge (no rename detection) is clean.
2import { join } from 'node:path';
3import { mkdirSync, writeFileSync, rmSync } from 'node:fs';
4import { spawnSync } from 'node:child_process';
5import { startGitServer, makeBareRepo, tmpRoot } from '/home/claude/ply/test/server.js';
6import { mergeBranch } from '/home/claude/ply/src/merge.js';
7import { Tracer } from '/home/claude/ply/src/otel.js';
8const ENV = { ...process.env, GIT_AUTHOR_NAME: 'w', GIT_AUTHOR_EMAIL: 'w@x', GIT_COMMITTER_NAME: 'w', GIT_COMMITTER_EMAIL: 'w@x', GIT_CONFIG_COUNT: '1', GIT_CONFIG_KEY_0: 'commit.gpgsign', GIT_CONFIG_VALUE_0: 'false' };
9const sh = (cwd, a) => spawnSync('git', ['-C', cwd, ...a], { encoding: 'utf8', env: ENV });
10const { root, cleanup } = tmpRoot(); const srv = await startGitServer(root);
11const body = n => Array.from({ length: 30 }, (_, i) => `line ${i} of ${n}\n`).join('');
12const CASES = {
13 'rename/rename(1to2)': { base: { 'a.txt': body('a') }, ours: w => sh(w, ['mv', 'a.txt', 'b.txt']), theirs: w => sh(w, ['mv', 'a.txt', 'c.txt']) },
14 'rename/delete': { base: { 'a.txt': body('a') }, ours: w => sh(w, ['mv', 'a.txt', 'b.txt']), theirs: w => sh(w, ['rm', '-q', 'a.txt']) },
15 'dir rename + add': { base: { 'd/x.txt': body('x'), 'd/y.txt': body('y') }, ours: w => sh(w, ['mv', 'd', 'e']), theirs: w => { writeFileSync(join(w, 'd/new.txt'), 'new\n'); sh(w, ['add', '-A']); } },
16};
17let i = 0;
18for (const [name, c] of Object.entries(CASES)) {
19 const bare = makeBareRepo(root, `rr${i}`); const w = join(root, `w${i++}`); mkdirSync(w); sh(w, ['init', '-q', '-b', 'main']);
20 for (const [p, v] of Object.entries(c.base)) { mkdirSync(join(w, p, '..'), { recursive: true }); writeFileSync(join(w, p), v); }
21 sh(w, ['add', '-A']); sh(w, ['commit', '-q', '-m', 'base']);
22 sh(w, ['checkout', '-q', '-b', 'feat']); c.theirs(w); sh(w, ['commit', '-q', '-am', 'theirs']); sh(w, ['add', '-A']); sh(w, ['commit', '-q', '--amend', '--no-edit']);
23 sh(w, ['checkout', '-q', 'main']); c.ours(w); sh(w, ['add', '-A']); sh(w, ['commit', '-q', '-m', 'ours']);
24 sh(w, ['push', '-q', bare, 'main', 'feat']);
25 const g = sh(bare, ['merge-tree', '--write-tree', '--name-only', 'main', 'feat']);
26 let ours; try { ours = (await mergeBranch(`${srv.url}/rr${i - 1}.git`, { ref: 'refs/heads/main', from: 'refs/heads/feat', author: { name: 'm', email: 'm@x' } }, { tracer: new Tracer() })).outcome; } catch (e) { ours = e.code; }
27 console.log(`${name.padEnd(22)} git: ${g.status === 0 ? 'clean' : 'CONFLICT'} ply: ${ours}${g.status !== 0 && ours === 'merge' ? ' <-- WRONG: clean where git conflicts' : ''}`);
28}
29await srv.close(); cleanup();
Diagnostics4 git calls · 558 ms
CallStatusSizeTime0558 ms
discover200152 B2 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=2 git.response.bytes=152 git.server.agent=gitty/1.0 git.server.object_format=sha1 git.server.caps=agent ls-refs fetch object-format git.server.fetch=shallow filter sideband-all git.protocol.version=2 git.pkt.frames=8 git.pkt.data=6 git.pkt.flush=2 git.pkt.delim=0 git.pkt.bytes=152 git.pkt.payload.max=34
ls-refs200145 B · hit2 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=2 git.response.bytes=145 git.response.cache=HIT git.response.duration_ms=2 git.protocol.version=2 git.pkt.frames=3 git.pkt.data=2 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=145 git.pkt.payload.max=76 git.ls_refs.count=2 git.ls_refs.head=refs/heads/main
fetchblob:none · deepen 1020038 KiB · hit3 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=3 git.response.bytes=38434 git.response.cache=HIT git.response.duration_ms=3 git.fetch.filter=blob:none git.fetch.filter.requested=tree:0 git.fetch.filter.fallback=blob:none git.fetch.filter.learned=false git.fetch.wants=19912563f540228593df0c489082e5e2508e21e4 git.fetch.haves.count=0 git.fetch.deepen=10 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=6 git.pkt.data=4 git.pkt.flush=1 git.pkt.delim=1 git.pkt.bytes=38434 git.pkt.payload.max=38339 git.sideband.band1.bytes=38338 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=63 git.pack.bytes=38338 git.pack.ofs_delta=0 git.pack.ref_delta=8 git.pack.chain.max=8 git.pack.trailer=0bc36ab7adf82d3109177f11f1ea93f1ce071f77 git.pack.full=55Open pack map
fetch2001.2 KiB553 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=553 git.response.bytes=1223 git.response.cache=MISS git.response.duration_ms=553 git.fetch.wants=bbbd1271342503e4ae6850da5e31417eac3a6c71 git.fetch.haves.count=0 git.fetch.deepen=0 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=3 git.pkt.data=2 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=1223 git.pkt.payload.max=1202 git.sideband.band1.bytes=1201 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0
Each row is one HTTP round trip ply made to the git server for this page, on one timeline. discover asks what the server speaks, ls-refs lists branch tips, fetch brings objects by id. A hit was served by Workers Cache. Tap a row for its wire details.
- Remote
- https://5ad2236b39de4c8bd8f6270ea63f3ea9.artifacts.cloudflare.net/git/public-v0/ply.git
- Ref
- refs/heads/main
- Commit
- 19912563f540228593df0c489082e5e2508e21e4
- cf-ray
- a5e35b3e8d41dfff
- Request
- a53e953b…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format