GitHubivarvong
ply
main
1import { join } from 'node:path'; import { mkdirSync, writeFileSync } from 'node:fs'; import { spawnSync } from 'node:child_process';
2import { startGitServer, makeBareRepo, tmpRoot } from '/home/claude/ply/test/server.js';
3import { mergeBranch } from '/home/claude/ply/src/merge.js'; import { Tracer } from '/home/claude/ply/src/otel.js';
4const 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' };
5const sh = (cwd, a) => spawnSync('git', ['-C', cwd, ...a], { encoding: 'utf8', env: ENV });
6const { root, cleanup } = tmpRoot(); const srv = await startGitServer(root);
7for (const flip of [false, true]) {
8 const name = `cc${+flip}`, bare = makeBareRepo(root, name), w = join(root, `w${name}`); mkdirSync(w); sh(w, ['init', '-q', '-b', 'main']);
9 const put = v => { writeFileSync(join(w, 'f'), v); sh(w, ['add', '-A']); };
10 put('x\n'); sh(w, ['commit', '-qm', 'B']);
11 sh(w, ['checkout', '-qb', 'feat']); writeFileSync(join(w, 'g'), 'g\n'); sh(w, ['add', '-A']); sh(w, ['commit', '-qm', 'C1']);
12 sh(w, ['checkout', '-q', 'main']); put('a\n'); sh(w, ['commit', '-qm', 'A1']);
13 const A1 = sh(w, ['rev-parse', 'HEAD']).stdout.trim(), C1 = sh(w, ['rev-parse', 'feat']).stdout.trim();
14 // criss-cross: main merges C1; feat merges A1 but resolves f back to x
15 // main := merge(C1, A1) keeping f=a (first parent C1); feat := merge(A1, C1) reverting f=x
16 sh(w, ['checkout', '-q', '--detach', C1]); sh(w, ['merge', '-q', '--no-edit', A1]); const M = sh(w, ['rev-parse', 'HEAD']).stdout.trim();
17 sh(w, ['checkout', '-q', '--detach', A1]); sh(w, ['merge', '-q', '--no-commit', C1]); put('x\n'); sh(w, ['commit', '-qm', 'F (reverts f)']); const F = sh(w, ['rev-parse', 'HEAD']).stdout.trim();
18 sh(w, ['branch', '-f', 'main', M]); sh(w, ['branch', '-f', 'feat', F]); sh(w, ['checkout', '-q', 'main']);
19 sh(w, ['push', '-q', bare, 'main', 'feat']);
20 const bases = sh(bare, ['merge-base', '--all', 'main', 'feat']).stdout.trim().split('\n').length;
21 const g = sh(bare, ['merge-tree', '--write-tree', 'main', 'feat']); const gitF = g.status === 0 ? sh(bare, ['cat-file', '-p', `${g.stdout.split('\n')[0]}:f`]).stdout.trim() : 'CONFLICT';
22 let ours; try { const m = await mergeBranch(`${srv.url}/${name}.git`, { ref: 'refs/heads/main', from: 'refs/heads/feat', author: { name: 'm', email: 'm@x' } }, { tracer: new Tracer() }); ours = sh(bare, ['cat-file', '-p', `${m.oid}:f`]).stdout.trim(); } catch (e) { ours = e.code; }
23 console.log(`merge bases: ${bases}; git f=${gitF}; ply f=${ours}${gitF !== 'CONFLICT' && ours !== 'merge_conflict' && ours !== gitF ? ' <-- WRONG' : ''}`);
24}
25await srv.close(); cleanup();
Diagnostics7 git calls · 33 ms
CallStatusSizeTime033 ms
discover200191 B3 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=3 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 KiB4 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=3 git.response.bytes=11990 git.response.cache=UPDATING git.response.duration_ms=4 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 · hit18 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=18 git.response.bytes=1196 git.response.cache=HIT git.response.duration_ms=18 git.fetch.wants=c78f3ef545fbb10499cab73d7b114eb9625bd570 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=1196 git.pkt.payload.max=1169 git.sideband.band1.bytes=1169 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
- a5e2f6d4efd03a24
- Request
- f4ad30fa…
- 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