ci-commitmessage-submodules: Ignore empty merge commits#2079
ci-commitmessage-submodules: Ignore empty merge commits#2079openshift-merge-robot merged 1 commit intocoreos:masterfrom
Conversation
jlebon
force-pushed
the
pr/skip-merges-ci
branch
4 times, most recently
from
c483a48 to
8ea89cc
Compare
jlebon
changed the title
|
OK, this should be ready now! Should allow CI to stop breaking all the PRs every time there's a libdnf bump. |
|
/approve |
Jenkins does its own `git merge` when testing PRs. Doing a naive
`git diff ${merge_commit}^..${merge_commit}` won't work right because
it might perform a diff across multiple commits.
What we want to do here is to just skip trivial merge commits or
otherwise error out on them if they're non-trivial (since it likely
means that one did conflict resolution manually instead of rebasing,
which we should encourage).
The `origin/master..$HEAD` range will correctly still contain all the
parents of any merge commit which is not yet in `origin/master`.
|
Ahh heh. The commit message for this commit itself had a line that started with |
Looks like other PRs are hitting this too. Investigating. |
OK, so basically the overlap of cosa overrides + lockfiles needs some more ironing out. I filed coreos/coreos-assembler#1431 for now, but I started on a patch to fix this. |
🎉 |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, jlebon The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
4 participants
Jenkins does its own
git mergewhen testing PRs. Doing a naivegit diff ${merge_commit}^..${merge_commit}won't work right becauseit might perform a diff across multiple commits.
What we want to do here is to just skip trivial merge commits or
otherwise error out on them if they're non-trivial (since it likely
means that one did conflict resolution manually instead of rebasing,
which we should encourage).
The
origin/master..$HEADrange will correctly still contain all theparents of any merge commit which is not yet in
origin/master.