[WIP] Revert commit 01ebc0cd for whitelist optimization with DCO#3288
Closed
Copilot wants to merge 2 commits into
Closed
[WIP] Revert commit 01ebc0cd for whitelist optimization with DCO#3288Copilot wants to merge 2 commits into
Copilot wants to merge 2 commits into
Conversation
This file contains hidden or 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
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.
01ebc0c(remove empty "Initial plan" commit)01ebc0cdf542bb46db90ca8ecb641f26ca9247a0withSigned-off-bytrailerOriginal prompt
Background
PR #3287 (#3287) was opened via GitHub's web UI "Revert" button to revert PR #3162 (commit
01ebc0cdf542bb46db90ca8ecb641f26ca9247a0) due to a CI failure: https://buildkite.com/vllm/vllm-omni/builds/8571/canvasHowever, the revert commit on PR #3287 is missing a
Signed-off-bytrailer, so the DCO check fails and blocks merging. Web UI revert commits cannot be amended without rewriting history / force-pushing.Task
Create a new pull request that reverts the same commit, with a properly signed-off commit, so it can replace PR #3287.
Requirements
mainrevert-3162-whitelist-optimization-signed(or similar; pick something clearly distinguishable from the existingrevert-3162-whitelist-optimizationbranch)01ebc0cdf542bb46db90ca8ecb641f26ca9247a0frommain. You can do this with:git revert -s 01ebc0cdf542bb46db90ca8ecb641f26ca9247a0if your git version supports-son revert (it does in modern git).Signed-off-by:trailer (rungit log -1 --format=%Bto confirm).PR description
Open the PR against
mainwith the following body:Title:
Notes
git revertof the listed SHA.revert-3162-whitelist-optimizationbranch or PR [CI failed]Revert "[Config Refactor] Derive deploy override fields from stage config" #3287 — a maintainer will close that one manually after this new PR is opened.The following is the prior conversation context from the user's chat exploration (may be truncated):
User: 请帮我解决这个PR的DCO问题
Assistant: 这个 PR 只有 1 个 commit,且是通过 GitHub 网页 UI 创建的 revert commit,commit message 中缺少
Signed-off-by行,因此 DCO 检查失败:由于通过 GitHub Web UI 创建的 revert commit 没有自动加上 sign-off,且我无法仅修改 commit message 而不动 tree,最稳妥的做法是你在本地 amend 后 force-push。请执行以下命令:
执行前请确认你的 git 配置与 GitHub 账户邮箱一致(DCO 要求 sign-off 邮箱与 commit author 邮箱匹配):
push 之后 DCO 检查会自动重跑通过。
User: 需要
Assistant: 抱歉,我需要更正一下之前的说法。我重新检查了我可用的工具,发现我无法通过 API 直接修复这个 DCO 问题。原因如下:
create_or_update_file和push_files,这两个都会在分支顶端追加新 commit,而不能 amend 已有 commit 或重写 commit message。Signed-off-by的空 commit,原来那个 revert commit 仍然没签名,DCO 还是会失败。git commit --amend -s+git push --force-with-lease完成。推荐方案
方案 A(推荐,最快):本地一行命令搞定
方案 B:直接在 GitHub Web UI 上操作
实际上 GitHub Web UI 的 Revert 按钮目前不支持自动 sign-off,所以最干净的还是方案 A。
如果你想让我通过 Coding Agent 帮你新开一个带 sign-off 的 revert PR(然后你关掉 #3287),可以告诉我,我会调用 coding agent 来做。但如果你能本地执行上面 4 行命令,会比新开 PR 更快。
User: 请通过 Coding Agent 帮你新开一个带 sign-off 的 revert PR
Assistant: 已派给 Coding Agent 处理。它将:
main创建新分支revert-3162-whitelist-optimization-signedgit revert还原 commit01ebc0cdf542bb46db90ca8ecb641f26ca9247a0(即原 PR [Config Refactor] Derive deploy override fields from stage config #3162)Signed-off-by以满足 DCO任务进展可在 https://github...
This pull request was created from Copilot chat.