Skip to content

fix(git): don't pass extraCloneOpts to ls-remote when local clone exists #42491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
viceice merged 4 commits into from
Apr 15, 2026
Merged

fix(git): don't pass extraCloneOpts to ls-remote when local clone exists #42491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f78cbd
fix(workers/repository): cleanup localDir before recursive retry afte…
Churro Apr 8, 2026
630f7f2
add test for failed directory cleanup
Churro Apr 8, 2026
352b17d
Merge remote-tracking branch 'upstream/main' into fix/repository-ls-r…
Churro Apr 14, 2026
04df9e5
fix(git): don't pass extraCloneOpts to ls-remote when local clone exists
Churro Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions lib/util/git/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,6 +1046,26 @@ describe('util/git/index', { timeout: 10000 }, () => {
const res = (await repo.raw(['config', 'extra.clone.config'])).trim();
expect(res).toBe('test-extra-config-value');
});

it('should not pass extraCloneOpts to ls-remote when local repo exists', async () => {
const extraCloneOpts = {
'-c': 'extra.clone.config=test-extra-config-value',
};

await fs.emptyDir(tmpDir.path);
await git.initRepo({ url: origin.path, extraCloneOpts, fullClone: true });
await git.syncGit();

const rawSpy = vi.spyOn(SimpleGit.prototype, 'raw');

await git.initRepo({ url: origin.path, extraCloneOpts, fullClone: true });

expect(rawSpy).toHaveBeenCalledWith([
'ls-remote',
'--heads',
origin.path,
]);
});
});

describe('setGitAuthor()', () => {
Expand Down
4 changes: 3 additions & 1 deletion lib/util/git/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,9 @@ async function fetchBranchCommits(preferUpstream = true): Promise<void> {
preferUpstream && config.upstreamUrl ? config.upstreamUrl : config.url;
logger.debug(`fetchBranchCommits(): url=${url}`);
const opts = ['ls-remote', '--heads', url];
if (config.extraCloneOpts) {
const localDir = GlobalConfig.get('localDir')!;
const repoExists = await fs.pathExists(upath.join(localDir, '.git/HEAD'));
if (config.extraCloneOpts && !repoExists) {
Comment thread
viceice marked this conversation as resolved.
Object.entries(config.extraCloneOpts).forEach((e) =>
// TODO: types (#22198)
opts.unshift(e[0], `${e[1]!}`),
Expand Down
Loading