search

whatwg / html-build

Build scripts for https://github.com/whatwg/html
Other
62 stars 62 forks source link

Avoid generating review drafts for merge commits. #284

Closed dbaron closed 11 months ago

dbaron commented 11 months ago

This avoids generating review drafts for merge commits unless the merge commit has modifications to the review draft (which I hope means that it's different from all parents of the merge).

The code prior to this change tries to generate a review draft if the first parent of the merge commit introduces a review draft. (This happens if "git merge main" is done on a feature branch and main has introduced a review draft.)

This came up in the discussion starting in https://github.com/whatwg/html/pull/9400#issuecomment-1730545420 .

I'm not aware of a better way to tell git show to skip the header other than --format=format:.

I'm not 100% sure about how this handles all edge cases, but I tested the git command against the basic cases of a regular commit that does or doesn't modify a review draft, and against two variants of merge commit from the above pull (with parents in both orders).

dbaron commented 11 months ago

This git command appears unchanged since it was introduced in c38c237c8f15be619e05df6edf8216a08d7bc610.

dbaron commented 11 months ago

(Also, seems like I don't have the power to make a review request in this repository, but I was hoping to request review from @domenic, who has made most of the recent changes to this file.)

dbaron commented 11 months ago

Created https://github.com/whatwg/whatwg.org/pull/424 . (I did see that comment, but I couldn't figure out what it was referring to.)