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.

Sign up for GitHub

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

Jump to bottom

Backport all commits from a PR without squashing #54

Closed
lampajr opened this issue Jul 10, 2023 · 1 comment · Fixed by #55
Closed

Backport all commits from a PR without squashing #54

lampajr opened this issue Jul 10, 2023 · 1 comment · Fixed by #55
Labels
enhancement New feature or request

Comments

@lampajr
Copy link
Member

lampajr commented Jul 10, 2023

Right now the tool merge merge_commit_sha if present which is basically the squashed commit for that PR, but there may be situations where users would like to cherry-pick all commits in a specific pull request.

Proposal:

  1. Add new cli option squash (default set to true)
  2. If squash=true the behavior would exactly as it is now
  3. If squash=false retrieve all commits from that pr and backport all of them.
@lampajr lampajr added the enhancement New feature or request label Jul 10, 2023
lampajr added a commit to lampajr/git-backporting that referenced this issue Jul 10, 2023
@lampajr
feat(issue-54): backport pr commits without squash
171f68a 
Fix kiegroup#54
lampajr added a commit to lampajr/git-backporting that referenced this issue Jul 10, 2023
@lampajr
feat(issue-54): backport pr commits without squash
0cb7aec 
Fix kiegroup#54
lampajr added a commit to lampajr/git-backporting that referenced this issue Jul 10, 2023
@lampajr
feat(issue-54): backport pr commits without squash
366695b 
Fix kiegroup#54
lampajr added a commit to lampajr/git-backporting that referenced this issue Jul 10, 2023
@lampajr
feat(issue-54): backport pr commits without squash
5cd5a1a 
Fix kiegroup#54
lampajr added a commit to lampajr/git-backporting that referenced this issue Jul 10, 2023
@lampajr
feat(issue-54): backport pr commits without squash
3a36112 
Fix kiegroup#54
lampajr added a commit to lampajr/git-backporting that referenced this issue Jul 11, 2023
@lampajr
feat(issue-54): backport pr commits without squash
eee58ff 
Fix kiegroup#54
@lampajr lampajr mentioned this issue Jul 11, 2023
Merged
2 tasks
lampajr added a commit to lampajr/git-backporting that referenced this issue Jul 11, 2023
@lampajr
feat(issue-54): backport pr commits without squash
a2f3ff0 
Fix kiegroup#54
lampajr added a commit that referenced this issue Jul 11, 2023
@lampajr
feat(issue-54): backport pr commits without squash (#55)
c4dbb26 
* feat(issue-54): backport pr commits without squash

fix #54

* feat(issue-54): fixed readme
@lampajr
Copy link
Member Author

lampajr commented Jul 11, 2023

@pierreprinetti fyi main branch already contains this new feature, you just have to add no-squash in the inputs while calling this action, or --no-squash from command line.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

feat(issue-54): backport pr commits without squash lampajr/git-backporting
1 participant
@lampajr