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

fix(internal/pkg/externalplugins/cherrypicker): do not change commit message #1188

Merged
merged 10 commits into from
Aug 6, 2024

Conversation

wuhuizuo
Copy link
Contributor

@wuhuizuo wuhuizuo commented Aug 6, 2024

add option for git cherry-pick command: --cleanup=verbatim.

Signed-off-by: wuhuizuo [email protected]

What problem does this PR solve?

Issue Number: close #xxx

Problem Summary:

What is changed and how it works?

What's Changed:

How it Works:

@ti-chi-bot ti-chi-bot bot requested a review from Mini256 August 6, 2024 02:15
@ti-chi-bot ti-chi-bot bot added the dco-signoff: yes Indicates the PR's author has signed the dco. label Aug 6, 2024
@ti-chi-bot ti-chi-bot bot requested a review from purelind August 6, 2024 02:15
@ti-chi-bot ti-chi-bot bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 6, 2024
@@ -646,7 +646,7 @@ func (s *Server) handle(logger *logrus.Entry, requestor string,
}

// Try git cherry-pick.
cherrypick := ex.Command("git", "cherry-pick", "-m", "1", *pr.MergeSHA)
cherrypick := ex.Command("git", "cherry-pick", "-m", "1", "--cleanup=verbatim", *pr.MergeSHA)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just this line will fix the line join issue.

…message

add option for `git cherry-pick command`: `--cleanup=verbatim`.

Signed-off-by: wuhuizuo <[email protected]>
@wuhuizuo wuhuizuo force-pushed the fix/cherry-picker-commit-message branch from bf42654 to de79f85 Compare August 6, 2024 06:18
Copy link

codecov bot commented Aug 6, 2024

Codecov Report

Attention: Patch coverage is 75.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 80.47%. Comparing base (5e828be) to head (9ef9a05).
Report is 5 commits behind head on master.

Files Patch % Lines
...l/pkg/externalplugins/cherrypicker/cherrypicker.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1188      +/-   ##
==========================================
- Coverage   80.48%   80.47%   -0.02%     
==========================================
  Files          21       21              
  Lines        3326     3324       -2     
==========================================
- Hits         2677     2675       -2     
  Misses        419      419              
  Partials      230      230              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: wuhuizuo <[email protected]>
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 6, 2024
@wuhuizuo
Copy link
Contributor Author

wuhuizuo commented Aug 6, 2024

/retest

Signed-off-by: wuhuizuo <[email protected]>
Signed-off-by: wuhuizuo <[email protected]>
Signed-off-by: wuhuizuo <[email protected]>
Signed-off-by: wuhuizuo <[email protected]>
Signed-off-by: wuhuizuo <[email protected]>
@wuhuizuo wuhuizuo added the lgtm label Aug 6, 2024
@wuhuizuo
Copy link
Contributor Author

wuhuizuo commented Aug 6, 2024

/approve

Copy link
Contributor

ti-chi-bot bot commented Aug 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wuhuizuo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Aug 6, 2024
@ti-chi-bot ti-chi-bot bot merged commit ac98cbf into master Aug 6, 2024
6 of 7 checks passed
@ti-chi-bot ti-chi-bot bot deleted the fix/cherry-picker-commit-message branch August 6, 2024 09:08
ti-chi-bot bot pushed a commit to PingCAP-QE/ee-ops that referenced this pull request Aug 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved dco-signoff: yes Indicates the PR's author has signed the dco. lgtm size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant