main
1import { join } from 'node:path'; import { mkdirSync, writeFileSync, copyFileSync } from 'node:fs'; import { spawnSync } from 'node:child_process';
2import { startGitServer, makeBareRepo, tmpRoot } from '/home/claude/ply/test/server.js'; import { Tracer } from '/home/claude/ply/src/otel.js';
3const 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' };
4const sh = (cwd, a) => spawnSync('git', ['-C', cwd, ...a], { encoding: 'utf8', env: ENV }).stdout.trim();
5copyFileSync('/tmp/oldmerge.js', '/home/claude/ply/src/merge.old.js');
6const { root, cleanup } = tmpRoot(); const srv = await startGitServer(root);
7for (const which of ['merge.old.js', 'merge.js']) {
8 const { mergeBranch } = await import(`/home/claude/ply/src/${which}`);
9 const name = `t${which.length}`, bare = makeBareRepo(root, name), w = join(root, `w${name}`); mkdirSync(w); sh(w, ['init', '-q', '-b', 'main']);
10 const put = (p, v) => { writeFileSync(join(w, p), v); sh(w, ['add', '-A']); };
11 put('f', 'r\n'); sh(w, ['commit', '-qm', 'r']); const R = sh(w, ['rev-parse', 'HEAD']);
12 put('f', 'y\n'); sh(w, ['commit', '-qm', 'y']); const Y = sh(w, ['rev-parse', 'HEAD']);
13 sh(w, ['checkout', '-qb', 'feat']); put('h', 'h\n'); sh(w, ['commit', '-qm', 'feat']); const FT = sh(w, ['rev-parse', 'HEAD']);
14 sh(w, ['checkout', '-q', '--detach', Y]); for (let i = 1; i <= 3; i++) { put(`p${i}`, `${i}\n`); sh(w, ['commit', '-qm', `p${i}`]); } const P3 = sh(w, ['rev-parse', 'HEAD']);
15 sh(w, ['checkout', '-q', '--detach', R]); sh(w, ['merge', '-q', '--no-ff', '--no-commit', P3]); put('f', 'r\n'); sh(w, ['commit', '-qm', 'm']); const MM = sh(w, ['rev-parse', 'HEAD']);
16 sh(w, ['push', '-q', '-f', bare, `${MM}:refs/heads/main`, `${FT}:refs/heads/feat`]);
17 const g = spawnSync('git', ['-C', bare, 'merge-tree', '--write-tree', 'main', 'feat'], { encoding: 'utf8' }); const gitF = sh(bare, ['cat-file', '-p', `${g.stdout.split('\n')[0]}:f`]);
18 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() });
19 console.log(`${which}: base ${m.base === Y ? 'y' : m.base === R ? 'r' : m.base}; git f=${gitF}; ply f=${sh(bare, ['cat-file', '-p', `${m.oid}:f`])}`);
20}
21await srv.close(); cleanup();
Diagnostics4 git calls · 24 ms
CallStatusSizeTime024 ms
discover200152 B3 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=3 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 · hit3 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=145 git.response.cache=HIT git.response.duration_ms=3 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=18 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.1 KiB · hit18 ms
git.upload-pack fetch http.response.status_code=200 git.response.bytes=1098 git.response.cache=HIT git.response.duration_ms=18 git.fetch.wants=9f9d98bae5e6f5506cd644f5995ddc6acb7cfa05 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=1098 git.pkt.payload.max=1077 git.sideband.band1.bytes=1076 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
- a5e2e24d298b4af4
- Request
- b48382cd…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format