Skip to content

fix(core): add explicit git identity env vars to prevent sandbox checkpointing error #19775

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
DavidAPierce merged 4 commits into from
Apr 9, 2026
Merged

fix(core): add explicit git identity env vars to prevent sandbox checkpointing error #19775

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
b1d0783
fix(core): add explicit git identity env vars to prevent sandbox chec…
mrpmohiburrahman Feb 21, 2026
8761421
Merge branch 'main' into fix/14646-sanbox-checkpoint-issue
DavidAPierce Apr 8, 2026
862229a
Merge branch 'main' into fix/14646-sanbox-checkpoint-issue
DavidAPierce Apr 8, 2026
acd5627
Merge branch 'main' into fix/14646-sanbox-checkpoint-issue
DavidAPierce Apr 9, 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
13 changes: 10 additions & 3 deletions packages/core/src/services/gitService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ import {
afterEach,
type Mock,
} from 'vitest';
import { GitService } from './gitService.js';
import {
GitService,
SHADOW_REPO_AUTHOR_NAME,
SHADOW_REPO_AUTHOR_EMAIL,
} from './gitService.js';
import { Storage } from '../config/storage.js';
import * as path from 'node:path';
import * as fs from 'node:fs/promises';
Expand Down Expand Up @@ -192,8 +196,7 @@ describe('GitService', () => {
const service = new GitService(projectRoot, storage);
await service.setupShadowGitRepository();

const expectedConfigContent =
'[user]\n name = Gemini CLI\n email = gemini-cli@google.com\n[commit]\n gpgsign = false\n';
const expectedConfigContent = `[user]\n name = ${SHADOW_REPO_AUTHOR_NAME}\n email = ${SHADOW_REPO_AUTHOR_EMAIL}\n[commit]\n gpgsign = false\n`;
const actualConfigContent = await fs.readFile(gitConfigPath, 'utf-8');
expect(actualConfigContent).toBe(expectedConfigContent);
});
Expand Down Expand Up @@ -288,6 +291,10 @@ describe('GitService', () => {
expect.objectContaining({
GIT_CONFIG_GLOBAL: gitConfigPath,
GIT_CONFIG_SYSTEM: path.join(repoDir, '.gitconfig_system_empty'),
GIT_AUTHOR_NAME: SHADOW_REPO_AUTHOR_NAME,
GIT_AUTHOR_EMAIL: SHADOW_REPO_AUTHOR_EMAIL,
GIT_COMMITTER_NAME: SHADOW_REPO_AUTHOR_NAME,
GIT_COMMITTER_EMAIL: SHADOW_REPO_AUTHOR_EMAIL,
}),
);

Expand Down
13 changes: 11 additions & 2 deletions packages/core/src/services/gitService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import { simpleGit, CheckRepoActions, type SimpleGit } from 'simple-git';
import type { Storage } from '../config/storage.js';
import { debugLogger } from '../utils/debugLogger.js';

export const SHADOW_REPO_AUTHOR_NAME = 'Gemini CLI';
export const SHADOW_REPO_AUTHOR_EMAIL = 'gemini-cli@google.com';

export class GitService {
private projectRoot: string;
private storage: Storage;
Expand Down Expand Up @@ -58,6 +61,13 @@ export class GitService {
// Prevent git from using the user's global git config.
GIT_CONFIG_GLOBAL: gitConfigPath,
GIT_CONFIG_SYSTEM: systemConfigPath,
// Explicitly provide identity to prevent "Author identity unknown" errors
// inside sandboxed environments like Docker where the gitconfig might not
// be picked up properly.
GIT_AUTHOR_NAME: SHADOW_REPO_AUTHOR_NAME,
GIT_AUTHOR_EMAIL: SHADOW_REPO_AUTHOR_EMAIL,
GIT_COMMITTER_NAME: SHADOW_REPO_AUTHOR_NAME,
GIT_COMMITTER_EMAIL: SHADOW_REPO_AUTHOR_EMAIL,
};
}

Expand All @@ -73,8 +83,7 @@ export class GitService {

// We don't want to inherit the user's name, email, or gpg signing
// preferences for the shadow repository, so we create a dedicated gitconfig.
const gitConfigContent =
'[user]\n name = Gemini CLI\n email = gemini-cli@google.com\n[commit]\n gpgsign = false\n';
const gitConfigContent = `[user]\n name = ${SHADOW_REPO_AUTHOR_NAME}\n email = ${SHADOW_REPO_AUTHOR_EMAIL}\n[commit]\n gpgsign = false\n`;
await fs.writeFile(gitConfigPath, gitConfigContent);

const shadowRepoEnv = this.getShadowRepoEnv(repoDir);
Expand Down
Loading