Skip to content

[PATCH] Fix merge squash commit message #14

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
Merged
ValentinFrancois merged 16 commits into from
Feb 21, 2022
Merged

[PATCH] Fix merge squash commit message #14

ValentinFrancois merged 16 commits into from
Feb 21, 2022

Conversation

@ValentinFrancois
Copy link
Owner

@ValentinFrancois ValentinFrancois commented Feb 21, 2022

A bit stupid but:

  • When clicking on 'squash & merge', GitHub copies the PR title into the merged commit message, EXCEPT if there was only one commit in the PR.
  • The easiest solution to prevent that (because I based the entire CI on the fact that commits pushed to main should be named after the PR) is for now to add an extra empty commit automatically.
ValentinFrancois and others added 16 commits February 21, 2022 13:56
@ValentinFrancois
add extra empty commit if needed
67ae33f
@ValentinFrancois
fixes
df0d4bc
@ValentinFrancois
try triggering empty commit
ad39431
@ValentinFrancois
fix action argument arg
da0e421
@ValentinFrancois
fix 'not a git repository' error
938c38c
@ValentinFrancois
try fetch-depth=1
ac17818
@ValentinFrancois
checkout branch directly with the action
f99c8ff
@ValentinFrancois
correct way was to actually use checkout action
897760c
@ValentinFrancois
Add empty commit to force PR merge squash using PR title
86c70c6
@ValentinFrancois
change author names of automatic commits
7031100
@ValentinFrancois
Merge branch 'fix-merge-squash' of github.com:ValentinFrancois/python…
ad0b9ca 
…-gitlab-submodule into fix-merge-squash
@ValentinFrancois
use true github bot users
35a710f
@github-actions
Add empty commit to force PR merge squash using PR title
779438e
@ValentinFrancois
all good
7330384
@ValentinFrancois
Merge branch 'fix-merge-squash' of github.com:ValentinFrancois/python…
f04a380 
…-gitlab-submodule into fix-merge-squash
@ValentinFrancois
re-enable security checks
e566a7a
@ValentinFrancois ValentinFrancois merged commit 05a6d98 into main Feb 21, 2022
@ValentinFrancois ValentinFrancois deleted the fix-merge-squash branch February 21, 2022 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants

@ValentinFrancois