Skip to content
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

Port #33631 to dev16.0 (Low priority for code wrapping refactorings) #33790

Merged
merged 1 commit into from
Mar 2, 2019

Conversation

mavasani
Copy link
Member

@mavasani mavasani commented Mar 1, 2019

Code wrapping refactorings should be lower pri than other refactorings

Ports #33631 to dev16.0 branch

@mavasani mavasani added this to the 16.0.P4 milestone Mar 1, 2019
@mavasani mavasani requested a review from a team as a code owner March 1, 2019 17:50
@CyrusNajmabadi
Copy link
Member

@mavasani was this just a cherry-pick? if so, if you do cherry-pick -x it will keep track of the original commit hash.

Code wrapping refactorings should be lower pri than other refactorings

(cherry picked from commit 8d53065)
@mavasani
Copy link
Member Author

mavasani commented Mar 1, 2019

@CyrusNajmabadi I am trying still having a hard time to retain the same commit hash. I attempted git cherry-pick -x 8d53065 -m 1 but that still creates a new commit hash.

@CyrusNajmabadi
Copy link
Member

@CyrusNajmabadi I am trying still having a hard time to retain the same commit hash. I attempted git cherry-pick -x 8d53065 -m 1 but that still creates a new commit hash.

Sorry, i wasn't clear. You'll def get a new commit hash. It's just that by doing -x this new commit will properly point to the cherrypicked commit.

@CyrusNajmabadi
Copy link
Member

-x

When recording the commit, append a line that says "(cherry picked from commit …​)" to the original commit message in order to indicate which commit this change was cherry-picked from. This is done only for cherry picks without conflicts. Do not use this option if you are cherry-picking from your private branch because the information is useless to the recipient. If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful.

It's a minor thing. But it helps me know that thsi was just a cherry.

@mavasani
Copy link
Member Author

mavasani commented Mar 1, 2019

@CyrusNajmabadi Thanks, just force pushed c9183bd

@jinujoseph
Copy link
Contributor

Once merged will be available in 16.RC.2

@sharwell sharwell modified the milestones: 16.0.P4, 16.0 Mar 1, 2019
@CyrusNajmabadi
Copy link
Member

Thanks. if this is just a CP, with no changes. the 👍 from me

@mavasani mavasani merged commit 4de954e into dotnet:dev16.0 Mar 2, 2019
@mavasani mavasani deleted the WrappingPort branch March 2, 2019 00:17
@CyrusNajmabadi
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants