Skip to content

fix(git): time out cached commands #559

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

Open
SR0725 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(git): time out cached commands #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/utils/__tests__/git-test-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export function expectGitExecOptions(options: unknown, cwd?: string): void {
expect(options).toEqual(expect.objectContaining({
encoding: 'utf8',
stdio: ['pipe', 'pipe', 'ignore'],
timeout: 5_000,
windowsHide: true,
...(cwd ? { cwd } : {})
}));
Expand Down
2 changes: 2 additions & 0 deletions src/utils/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ interface PersistentGitCache {

const DEFAULT_GIT_CACHE_TTL_SECONDS = 5;
const GIT_CACHE_SCHEMA_VERSION = 1 as const;
const GIT_COMMAND_TIMEOUT_MS = 5_000;

// In-process cache keeps cwd in the key; the persistent cache stores cwd once
// at the file level and keys entries by command.
Expand Down Expand Up @@ -331,6 +332,7 @@ export function runGitArgs(args: string[], context: RenderContext, cacheCommand?
encoding: 'utf8',
stdio: ['pipe', 'pipe', 'ignore'],
env: { ...process.env, GIT_OPTIONAL_LOCKS: '0' },
timeout: GIT_COMMAND_TIMEOUT_MS,
windowsHide: true,
...(cwd ? { cwd } : {})
}).trimEnd();
Expand Down