This commit is contained in:
nrslib 2026-01-31 09:24:00 +09:00
parent c284e8f017
commit 2cfe77977c
2 changed files with 188 additions and 0 deletions

170
src/__tests__/clone.test.ts Normal file
View File

@ -0,0 +1,170 @@
/**
* Tests for clone module (cloneAndIsolate git config propagation)
*/
import { describe, it, expect, vi, beforeEach } from 'vitest';
vi.mock('node:child_process', () => ({
execFileSync: vi.fn(),
}));
vi.mock('node:fs', () => ({
default: {
mkdirSync: vi.fn(),
mkdtempSync: vi.fn(),
writeFileSync: vi.fn(),
existsSync: vi.fn(),
},
mkdirSync: vi.fn(),
mkdtempSync: vi.fn(),
writeFileSync: vi.fn(),
existsSync: vi.fn(),
}));
vi.mock('../utils/debug.js', () => ({
createLogger: () => ({
info: vi.fn(),
debug: vi.fn(),
error: vi.fn(),
}),
}));
vi.mock('../config/globalConfig.js', () => ({
loadGlobalConfig: vi.fn(() => ({})),
}));
import { execFileSync } from 'node:child_process';
import { createSharedClone, createTempCloneForBranch } from '../task/clone.js';
const mockExecFileSync = vi.mocked(execFileSync);
beforeEach(() => {
vi.clearAllMocks();
});
describe('cloneAndIsolate git config propagation', () => {
/**
* Helper: set up mockExecFileSync to simulate git commands.
* Returns a record of git config --set calls on the clone.
*/
function setupMock(localConfigs: Record<string, string>) {
const configSetCalls: { key: string; value: string }[] = [];
mockExecFileSync.mockImplementation((cmd, args, opts) => {
const argsArr = args as string[];
const options = opts as { cwd?: string };
// git clone
if (argsArr[0] === 'clone') {
return Buffer.from('');
}
// git remote remove origin
if (argsArr[0] === 'remote' && argsArr[1] === 'remove') {
return Buffer.from('');
}
// git config --local <key> (reading from source repo)
if (argsArr[0] === 'config' && argsArr[1] === '--local') {
const key = argsArr[2];
if (key in localConfigs) {
return Buffer.from(localConfigs[key] + '\n');
}
throw new Error(`key ${key} not set`);
}
// git config <key> <value> (writing to clone)
if (argsArr[0] === 'config' && argsArr.length === 3 && argsArr[1] !== '--local') {
configSetCalls.push({ key: argsArr[1], value: argsArr[2] });
return Buffer.from('');
}
// git rev-parse --verify (branchExists check)
if (argsArr[0] === 'rev-parse') {
throw new Error('branch not found');
}
// git checkout -b (new branch)
if (argsArr[0] === 'checkout') {
return Buffer.from('');
}
return Buffer.from('');
});
return configSetCalls;
}
it('should propagate user.name and user.email from source repo to clone', () => {
// Given: source repo has local user.name and user.email
const configSetCalls = setupMock({
'user.name': 'Test User',
'user.email': 'test@example.com',
});
// When: creating a shared clone
createSharedClone('/project', {
worktree: '/tmp/clone-dest',
taskSlug: 'test-task',
});
// Then: both user.name and user.email are set on the clone
expect(configSetCalls).toContainEqual({ key: 'user.name', value: 'Test User' });
expect(configSetCalls).toContainEqual({ key: 'user.email', value: 'test@example.com' });
});
it('should skip config propagation when source repo has no local user config', () => {
// Given: source repo has no local user.name or user.email
const configSetCalls = setupMock({});
// When: creating a shared clone
createSharedClone('/project', {
worktree: '/tmp/clone-dest',
taskSlug: 'test-task',
});
// Then: no git config set calls are made for user settings
expect(configSetCalls).toHaveLength(0);
});
it('should propagate only user.name when user.email is not set', () => {
// Given: source repo has only user.name
const configSetCalls = setupMock({
'user.name': 'Test User',
});
// When: creating a shared clone
createSharedClone('/project', {
worktree: '/tmp/clone-dest',
taskSlug: 'test-task',
});
// Then: only user.name is set on the clone
expect(configSetCalls).toEqual([{ key: 'user.name', value: 'Test User' }]);
});
it('should propagate git config when using createTempCloneForBranch', () => {
// Given: source repo has local user config
const configSetCalls = setupMock({
'user.name': 'Temp User',
'user.email': 'temp@example.com',
});
// Adjust mock to allow checkout of existing branch
const originalImpl = mockExecFileSync.getMockImplementation()!;
mockExecFileSync.mockImplementation((cmd, args, opts) => {
const argsArr = args as string[];
if (argsArr[0] === 'checkout' && argsArr[1] === 'existing-branch') {
return Buffer.from('');
}
return originalImpl(cmd, args, opts);
});
// When: creating a temp clone for a branch
createTempCloneForBranch('/project', 'existing-branch');
// Then: git config is propagated
expect(configSetCalls).toContainEqual({ key: 'user.name', value: 'Temp User' });
expect(configSetCalls).toContainEqual({ key: 'user.email', value: 'temp@example.com' });
});
});

View File

@ -108,6 +108,24 @@ function cloneAndIsolate(projectDir: string, clonePath: string): void {
cwd: clonePath, cwd: clonePath,
stdio: 'pipe', stdio: 'pipe',
}); });
// Propagate local git user config from source repo to clone
for (const key of ['user.name', 'user.email']) {
try {
const value = execFileSync('git', ['config', '--local', key], {
cwd: projectDir,
stdio: 'pipe',
}).toString().trim();
if (value) {
execFileSync('git', ['config', key, value], {
cwd: clonePath,
stdio: 'pipe',
});
}
} catch {
// not set locally — skip
}
}
} }
/** /**