Skip to content

Add --no-gpg-sign to codeflow git commits#6382

Merged
dkurepa merged 2 commits into
mainfrom
copilot/darc-vmr-no-gpg-sign-commits
Jun 10, 2026
Merged

Add --no-gpg-sign to codeflow git commits#6382
dkurepa merged 2 commits into
mainfrom
copilot/darc-vmr-no-gpg-sign-commits

Conversation

Copilot AI commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

darc vmr commands (e.g. resolve-conflict) make temporary local commits during codeflow. Users with GPG signing enabled globally get interrupted by signing-password prompts mid-operation.

All codeflow commits route through a small set of central git commit invocations, each now passes --no-gpg-sign:

  • LocalGitClient.CommitAsync — primary commit path used by all Vmr flowers and conflict resolvers (VmrManagerBase, WorkBranch, VmrBackFlower, CodeFlowConflictResolver, VmrCodeflower).
  • LocalGitClient.CommitAmendAsync — amend commits.
  • RemoteRepoBase — the remaining direct git commit in the PR-creation path.
IEnumerable<string> args = new[] { "commit", "--no-gpg-sign", "-m", message };

Merge/rebase steps in WorkBranch use --no-commit/--squash and finalize via CommitAsync, so they're covered by the central change.

#6266

Copilot AI changed the title [WIP] Fix temporary commits to disable gpg signing Add --no-gpg-sign to codeflow git commits Jun 10, 2026
Copilot AI requested a review from dkurepa June 10, 2026 07:12
@dkurepa dkurepa marked this pull request as ready for review June 10, 2026 07:37
Copilot AI review requested due to automatic review settings June 10, 2026 07:37
@dkurepa dkurepa enabled auto-merge (squash) June 10, 2026 07:37

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates DARC’s VMR/codeflow-related git commit invocations to explicitly disable GPG signing (--no-gpg-sign), preventing interactive signing/passphrase prompts during temporary/local commits that can interrupt darc vmr workflows.

Changes:

  • Add --no-gpg-sign to LocalGitClient.CommitAsync argument construction.
  • Add --no-gpg-sign to LocalGitClient.CommitAmendAsync.
  • Add --no-gpg-sign to the remaining direct git commit invocation in RemoteRepoBase.CommitFilesAsync.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
src/Microsoft.DotNet.Darc/DarcLib/RemoteRepoBase.cs Disables GPG signing for commit created during remote repo file commit/push flow.
src/Microsoft.DotNet.Darc/DarcLib/LocalGitClient.cs Disables GPG signing for standard and amend commit paths used by VMR/codeflow operations.

@dkurepa dkurepa merged commit 0413b8b into main Jun 10, 2026
8 of 12 checks passed
@dkurepa dkurepa deleted the copilot/darc-vmr-no-gpg-sign-commits branch June 10, 2026 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

darc vmr should make temporary commits with signing disabled

4 participants