Avoid generating review drafts for merge commits. #284
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This avoids generating review drafts for merge commits unless the merge commit has modifications to the review draft (which I believe 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 git command appears unchanged since it was introduced in c38c237. |
|
(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.) |
sideshowbarker
approved these changes
Sep 26, 2023
domenic
approved these changes
Sep 26, 2023
There was a problem hiding this comment.
Happy to trust you that this is better. Can you also update https://github.com/whatwg/whatwg.org/blob/main/resources.whatwg.org/build/deploy.sh#L125 so that these stay in sync, per the comment?
dbaron
added a commit
to dbaron/whatwg.org
that referenced
this pull request
Sep 26, 2023
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 matches the change in whatwg/html-build#284 .
This was referenced Sep 26, 2023
|
Created whatwg/whatwg.org#424 . (I did see that comment, but I couldn't figure out what it was referring to.) |
annevk
pushed a commit
to whatwg/whatwg.org
that referenced
this pull request
Sep 26, 2023
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 matches the change in whatwg/html-build#284 .
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 whatwg/html#9400 (comment) .
I'm not aware of a better way to tell
git showto 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).