GitHubivarvong
ply
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();
Diagnostics7 git calls · 117 ms
CallStatusSizeTime0117 ms
discover200191 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=191 git.server.agent=git/github-9922ec520325-Linux git.server.object_format=sha1 git.server.caps=agent ls-refs fetch server-option object-format git.server.fetch=shallow wait-for-done filter git.protocol.version=2 git.pkt.frames=9 git.pkt.data=7 git.pkt.flush=2 git.pkt.delim=0 git.pkt.bytes=191 git.pkt.payload.max=36
ls-refs20012 KiB68 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=67 git.response.bytes=11990 git.response.cache=EXPIRED git.response.duration_ms=68 git.protocol.version=2 git.pkt.frames=152 git.pkt.data=151 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=11990 git.pkt.payload.max=122 git.ls_refs.count=151 git.ls_refs.head=refs/heads/main
fetchtree:0 · deepen 102004.2 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=4347 git.response.cache=HIT git.response.duration_ms=3 git.fetch.filter=tree:0 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=7 git.pkt.data=5 git.pkt.flush=1 git.pkt.delim=1 git.pkt.bytes=4347 git.pkt.payload.max=4247 git.sideband.band1.bytes=4247 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=10 git.pack.bytes=4247 git.pack.ofs_delta=0 git.pack.ref_delta=0 git.pack.chain.max=0 git.pack.trailer=a6caf8e129bea82c9bae4cbc7c130c9205add400 git.pack.full=10Open pack map
fetchtree:0200919 B · hit2 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=2 git.response.bytes=919 git.response.cache=HIT git.response.duration_ms=2 git.fetch.filter=tree:0 git.fetch.wants=800d30ba8923860bfc460ca884b7f9ba22083588 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=4 git.pkt.data=3 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=919 git.pkt.payload.max=892 git.sideband.band1.bytes=892 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=1 git.pack.bytes=892 git.pack.trailer=5323b9266eea5ded637285d1c5320699f12be76eOpen pack map
fetchtree:0200173 B · 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=173 git.response.cache=HIT git.response.duration_ms=3 git.fetch.filter=tree:0 git.fetch.wants=1e7ce57bd97f2713fab4ed524583bb49a5470f58 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=4 git.pkt.data=3 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=173 git.pkt.payload.max=146 git.sideband.band1.bytes=146 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=1 git.pack.bytes=146 git.pack.trailer=2d126a93da520e5a3cb832ab0e41c23fc4d52fd8Open pack map
fetchtree:0200320 B · 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=320 git.response.cache=HIT git.response.duration_ms=3 git.fetch.filter=tree:0 git.fetch.wants=3efc56a11297b20b04d19cc3addee9fc5427d75a 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=4 git.pkt.data=3 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=320 git.pkt.payload.max=293 git.sideband.band1.bytes=293 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=1 git.pack.bytes=293 git.pack.trailer=8cddd60811600d002a2d79d8c5793e9a507416c4Open pack map
fetch2001.2 KiB · hit38 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=38 git.response.bytes=1228 git.response.cache=HIT git.response.duration_ms=38 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=4 git.pkt.data=3 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=1228 git.pkt.payload.max=1201 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://github.com/ivarvong/ply
- Ref
- refs/heads/main
- Commit
- 19912563f540228593df0c489082e5e2508e21e4
- cf-ray
- a5e166e06d0eb1a9
- Request
- 70eb4f3c…
- Protocol
- v2 · sha1
- Agent
- git/github-9922ec520325-Linux
- Filter
- advertised
- Fetch
- shallow wait-for-done filter
- Capabilities
- agent ls-refs fetch server-option object-format