Handle empty commits during cherry-pick and offer skip or continue options#4925

Closed

kosiew wants to merge 42 commits intojesseduffield:masterfrom

kosiew:cherry-freeze-4763

Commits on Oct 1, 2025

Add support for handling empty cherry-pick commits with user prompts
kosiew
committed
Implement handling for empty cherry-pick commits and add integration test
kosiew
committed
Add CherryPickEmptyCreateCommit to integration tests
kosiew
committed
Enhance cherry-pick handling: add support for empty commits and integrate new test case
kosiew
committed
Improve handling of empty cherry-pick scenarios by checking the working tree state before proceeding with commands
kosiew
committed
Enhance cherry-pick handling: support additional error messages for empty cherry-pick scenarios
kosiew
committed
Enhance cherry-pick tests: add SetupConfig for empty commit scenarios
kosiew
committed
Enhance cherry-pick functionality: implement post-paste cleanup and integrate with rebase helper
kosiew
committed
Enhance cherry-pick handling: add test for empty cherry-pick followed by conflict resolution
kosiew
committed
Enhance cherry-pick and revert handling: add support for empty commits with user prompts and integrate tests for empty commit resolutions
kosiew
committed
Enhance rebase handling: add check for working tree state before continuing rebase and update revert test to select create empty commit option
kosiew
committed
Enhance merge and rebase handling: improve error checking for empty cherry-pick and rebase scenarios
kosiew
committed
Refactor CheckMergeOrRebaseWithRefreshOptions: streamline empty commit handling and reorder conflict checks
kosiew
committed
Enhance CheckMergeOrRebaseWithRefreshOptions: streamline conflict handling and remove redundant checks for merge conflicts
kosiew
committed
Refactor CheckMergeOrRebaseWithRefreshOptions: reorder conflict checks and improve error handling for empty commits
kosiew
committed
Enhance rebase test: add confirmation step for skipping rebase when commit produces no changes
kosiew
committed
Enhance CheckMergeOrRebaseWithRefreshOptions: add prompt for conflict handling and remove redundant conflict check
kosiew
committed
Refactor CheckMergeOrRebaseWithRefreshOptions: reorder conflict handling to improve clarity and reduce redundancy
kosiew
committed
Enhance conflict handling: streamline prompt for merge conflicts and add support for "equals one of" matcher in tests
kosiew
committed
Fix CherryPickCommits: update argument for empty commits handling based on Git version
kosiew
committed
Enhance CherryPickCommits: update arguments for empty commits handling based on Git version
kosiew
committed
Refactor CherryPickCommits: remove unnecessary --allow-empty argument for cherry-pick command
kosiew
committed
Refactor CherryPickCommits: remove support for --keep-redundant-commits argument based on Git version
kosiew
committed
Enhance CherryPick integration tests: add handling for empty cherry-pick scenarios and improve popup interactions
kosiew
committed
Enhance CherryPick integration tests: add handling for duplicate empty commit popups
kosiew
committed
Enhance CherryPick functionality: update selection handling after paste operation
kosiew
committed
Enhance CherryPick functionality: adjust selection handling after paste operation
kosiew
committed
Enhance CherryPick functionality: improve post-paste selection handling and cleanup process
kosiew
committed
Enhance CherryPick functionality: finalize cherry-pick cleanup process and improve handling of empty commits in tests
kosiew
committed
Enhance CherryPick functionality: add method to check restoration of post-paste selection and improve handling after empty cherry-pick resolution
kosiew
committed
Enhance MoveCommitsToNewBranch test: add handling for empty cherry-pick scenario
kosiew
committed
Refactor completeCherryPickAfterEmptyResolution: simplify post-paste reselect handling
kosiew
committed
Enhance completeCherryPickAfterEmptyResolution: conditionally disable post-paste reselect based on parameter
kosiew
committed
Enhance cherry-pick handling: conditionally disable post-paste reselect and update test assertions for empty commits
kosiew
committed
Enhance cherry-pick conflict handling: add confirmation popup for skipping empty cherry-picks
kosiew
committed
Enhance cherry-pick handling: update completeCherryPickAfterEmptyResolution to preserve post-paste reselect option
kosiew
committed
Enhance cherry-pick handling: update empty cherry-pick resolution to disable post-paste reselect and improve test assertions for conflict scenarios
kosiew
committed
Enhance cherry-pick handling: add confirmation popups for empty cherry-pick scenarios
kosiew
committed
Enhance cherry-pick handling: add confirmation popup for empty cherry-pick scenarios
kosiew
committed
Enhance cherry-pick conflict resolution: update selection logic to correctly highlight the selected commit
kosiew
committed
feat: enhance cherry-pick post-paste behavior
kosiew
committed
feat: enhance cherry-pick functionality with pre-paste head hash tracking and add integration tests for empty intermediate commits
kosiew
committed