Skip to content

fix: respect git.requireGitUserConfig setting on commit errors #304983

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
yogeshwaran-c wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −13
Open

fix: respect git.requireGitUserConfig setting on commit errors #304983

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
28 changes: 15 additions & 13 deletions extensions/git/src/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2126,7 +2126,7 @@ export class Repository {
try {
await this.exec(args, options);
} catch (commitErr) {
await this.handleCommitError(commitErr);
await this.handleCommitError(commitErr, opts.requireUserConfig ?? true);
}
}

Expand All @@ -2145,7 +2145,7 @@ export class Repository {
}


private async handleCommitError(commitErr: unknown): Promise<void> {
private async handleCommitError(commitErr: unknown, requireUserConfig = true): Promise<void> {
if (commitErr instanceof GitError && /not possible because you have unmerged files/.test(commitErr.stderr || '')) {
commitErr.gitErrorCode = GitErrorCodes.UnmergedChanges;
throw commitErr;
Expand All @@ -2154,18 +2154,20 @@ export class Repository {
throw commitErr;
}

try {
await this.exec(['config', '--get-all', 'user.name']);
} catch (err) {
err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
throw err;
}
if (requireUserConfig) {
try {
await this.exec(['config', '--get-all', 'user.name']);
} catch (err) {
err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
throw err;
}

try {
await this.exec(['config', '--get-all', 'user.email']);
} catch (err) {
err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
throw err;
try {
await this.exec(['config', '--get-all', 'user.email']);
} catch (err) {
err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
throw err;
}
}

throw commitErr;
Expand Down