Prevent merging empty commits #809
Comments
xmo-odoo
added a commit
that referenced
this issue
Jan 16, 2024
The low-level APIs used by the staging process don't do any merge check, so because of the way Git works it's possible for them to merge commits with content as empty commits, e.g. if something was merged then backported and the backport was merged on top. This should trigger a merge failure as we don't really want to merge newly empty. This is a feature which some high level commands of git support, kind-of, e.g. by default `git rebase --interactive` will ask about newly empty commits. Take care to allow merging already-empty commits, as these do have a use for signaling, freezes, .... Fixes #809
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Because low level APIs are used during staging, if two PRs doing the same thing are merged one of them will just generate an empty commit. Which is not detrimental, but is not super useful either (it's noise in the history).
Might be a good idea to trigger a merge error if, during rebase, applying a commit does not change the tree.
Would probably need to fetch the tree of the commit being staged on, to ensure the first commit is also handled correctly.\
Beware the freeze wizard though, it needs to be able to merge empty commits.
The text was updated successfully, but these errors were encountered: