Repository navigation
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary of the issue:
Cherry picking an initially empty commit, or a commit whose changes are already present, stops with an error. The Cherry Pick dialog currently provides no way to keep that commit without switching to the terminal.
Description outlining how this pull request resolves the issue:
Adds an Allow Empty Commits checkbox and the
git-graph.dialog.cherryPick.allowEmptysetting (default:false). When selected, both initially empty and redundant commits are preserved using--keep-redundant-commits, which works with older supported Git versions as well as current ones. The option has no effect when No Commit is selected; the dialog explains this behavior.Adds regression coverage for configuration defaults, request forwarding, command arguments, merge parents, and the interaction with No Commit. Documents the new setting in the README.
Validation:
tsc -p ./web --types node, followed by successful production JS/CSS packaging.Environment note: the normal frontend build encounters TypeScript 4.0 parser errors in the currently resolved
@types/babel__traverse. Using--types nodeavoids unrelated ambient test types without changing repository configuration or dependencies. The VS Code Extension Development Host was not exercised.