Skip to content

Allow reverting a range of commits #4444

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.

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
wants to merge 3 commits into
base: implement-cherry-picking-with-git-cherry-pick
Choose a base branch
from

Conversation

stefanhaller
Copy link
Collaborator

  • PR Description

This is part four of a four part series of PRs that improve the cherry-pick and revert experience.

With this PR we support reverting a range selection of commits.

Fixes #3272

  • Please check if the PR fulfills these requirements
  • Cheatsheets are up-to-date (run go generate ./...)
  • Code has been formatted (see here)
  • Tests have been added/updated (see here for the integration test guide)
  • Text is internationalised (see here)
  • If a new UserConfig entry was added, make sure it can be hot-reloaded (see here)
  • Docs have been updated if necessary
  • You've read through your own file changes for silly mistakes etc

@stefanhaller stefanhaller added the enhancement New feature or request label Mar 31, 2025
@stefanhaller stefanhaller force-pushed the implement-cherry-picking-with-git-cherry-pick branch from dfda949 to d81bb8b Compare March 31, 2025 17:39
@stefanhaller stefanhaller force-pushed the revert-range-selection-of-commits branch from 622baa9 to e535935 Compare March 31, 2025 17:39
@stefanhaller stefanhaller force-pushed the implement-cherry-picking-with-git-cherry-pick branch from d81bb8b to e30f7b4 Compare March 31, 2025 19:19
@stefanhaller stefanhaller force-pushed the revert-range-selection-of-commits branch from e535935 to 81b1803 Compare March 31, 2025 19:19
Copy link

codacy-production bot commented Mar 31, 2025

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
-0.04% 100.00%
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (417080e) 54958 47726 86.84%
Head commit (c711aa4) 54918 (-40) 47670 (-56) 86.80% (-0.04%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#4444) 71 71 100.00%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

@stefanhaller stefanhaller force-pushed the implement-cherry-picking-with-git-cherry-pick branch from e30f7b4 to 3ff8f5c Compare April 5, 2025 09:26
@stefanhaller stefanhaller force-pushed the revert-range-selection-of-commits branch from 81b1803 to 9a5e245 Compare April 5, 2025 09:27
@stefanhaller stefanhaller force-pushed the implement-cherry-picking-with-git-cherry-pick branch from 3ff8f5c to fb458bb Compare April 7, 2025 12:43
@stefanhaller stefanhaller force-pushed the revert-range-selection-of-commits branch from 9a5e245 to 8aaacef Compare April 7, 2025 12:43
In pretty much 100% of the cases, you want to use -m1, so spare users the
complexity of a confusing prompt.

See
https://public-inbox.org/git/[email protected]/
for some discussion.
It's only called from one place now, so there's no reason not to inline it.
@stefanhaller stefanhaller force-pushed the implement-cherry-picking-with-git-cherry-pick branch from fb458bb to 417080e Compare April 10, 2025 09:53
@stefanhaller stefanhaller force-pushed the revert-range-selection-of-commits branch from 8aaacef to c711aa4 Compare April 10, 2025 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant