Use "git cherry-pick" for implementing copy/paste of commits #4443
Conversation
This file contains 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
stefanhaller
force-pushed
the
show-revert-and-cherry-pick-todos
branch
from
cd2e83f to
a8eefbc
Compare
stefanhaller
force-pushed
the
implement-cherry-picking-with-git-cherry-pick
branch
2 times, most recently
from
d81bb8b to
e30f7b4
Compare
Coverage summary from CodacySee diff coverage on Codacy
Coverage variation details
Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: Diff coverage details
Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: See your quality gate settings Change summary preferences |
stefanhaller
force-pushed
the
show-revert-and-cherry-pick-todos
branch
from
a8eefbc to
d88dd37
Compare
stefanhaller
force-pushed
the
implement-cherry-picking-with-git-cherry-pick
branch
from
e30f7b4 to
3ff8f5c
Compare
stefanhaller
force-pushed
the
show-revert-and-cherry-pick-todos
branch
from
d88dd37 to
57d7c9e
Compare
stefanhaller
force-pushed
the
implement-cherry-picking-with-git-cherry-pick
branch
from
3ff8f5c to
fb458bb
Compare
…ing new ones Previously we would create new Commit objects to store in the CherryPicking mode which only contained a name and hash, all other fields were unset. I'm not sure why we did this; it's easier to just reference the original commits. Later on this branch we will need this because we need to determine whether a copied commit was a merge commit (by looking at its Parents field).
We do this because - it's closer to what you would do on the command line - it simplifies the code a bit - it will allow us to support cherry-picking merge commits.
Now that we use git cherry-pick to implement it, there's no reason not to.
stefanhaller
force-pushed
the
show-revert-and-cherry-pick-todos
branch
from
57d7c9e to
c1143a2
Compare
stefanhaller
force-pushed
the
implement-cherry-picking-with-git-cherry-pick
branch
from
fb458bb to
417080e
Compare
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.
This is part three of a four part series of PRs that improve the cherry-pick and revert experience.
With this PR we reimplement copy/paste of commits to use
git cherry-pickunder the hood. We do this becauseFixes #1374
Fixes #3317
go generate ./...)