Skip to content

[WIP] Revert commit 01ebc0cd for whitelist optimization with DCO#3288

Closed
Copilot wants to merge 2 commits into
mainfrom
copilot/revert-3162-whitelist-optimization-signed
Closed

[WIP] Revert commit 01ebc0cd for whitelist optimization with DCO#3288
Copilot wants to merge 2 commits into
mainfrom
copilot/revert-3162-whitelist-optimization-signed

Conversation

Copy link
Copy Markdown

Copilot AI commented Apr 30, 2026

  • Reset branch to base commit 01ebc0c (remove empty "Initial plan" commit)
  • Revert commit 01ebc0cdf542bb46db90ca8ecb641f26ca9247a0 with Signed-off-by trailer
  • Push revert commit via report_progress
Original 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/canvas

However, the revert commit on PR #3287 is missing a Signed-off-by trailer, 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

  1. Base branch: main
  2. New branch name: revert-3162-whitelist-optimization-signed (or similar; pick something clearly distinguishable from the existing revert-3162-whitelist-optimization branch)
  3. Action: Revert commit 01ebc0cdf542bb46db90ca8ecb641f26ca9247a0 from main. You can do this with:
    git revert --no-edit 01ebc0cdf542bb46db90ca8ecb641f26ca9247a0
    Then amend the commit to add a sign-off:
    git commit --amend --no-edit -s
    Or simply use git revert -s 01ebc0cdf542bb46db90ca8ecb641f26ca9247a0 if your git version supports -s on revert (it does in modern git).
  4. Commit message should be:
    Revert "[Config Refactor] Derive deploy override fields from stage config (#3162)"
    
    This reverts commit 01ebc0cdf542bb46db90ca8ecb641f26ca9247a0.
    
    Signed-off-by: <your configured git author name> <your configured git author email>
    
  5. Verify that the resulting commit contains a Signed-off-by: trailer (run git log -1 --format=%B to confirm).
  6. The diff produced MUST exactly match the diff of PR [CI failed]Revert "[Config Refactor] Derive deploy override fields from stage config" #3287 (15 files changed, +59 / -129). Do not include any other unrelated changes.

PR description

Open the PR against main with the following body:

Reverts vllm-project/vllm-omni#3162 due to CI failure https://buildkite.com/vllm/vllm-omni/builds/8571/canvas

Re-opens #3287 with a proper DCO sign-off. Closes #3287.

Title:

[CI failed] Revert "[Config Refactor] Derive deploy override fields from stage config"

Notes

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 检查失败:

Revert "[Config Refactor] Derive deploy override fields from stage config (#3162)"

This reverts commit 01ebc0cdf542bb46db90ca8ecb641f26ca9247a0.

由于通过 GitHub Web UI 创建的 revert commit 没有自动加上 sign-off,且我无法仅修改 commit message 而不动 tree,最稳妥的做法是你在本地 amend 后 force-push。请执行以下命令:

# 1. 拉取分支
git fetch origin revert-3162-whitelist-optimization
git checkout revert-3162-whitelist-optimization

# 2. 用你的 DCO 身份 amend 当前 commit,加上 Signed-off-by
git commit --amend --no-edit -s

# 3. 强制推回 PR 分支
git push --force-with-lease origin revert-3162-whitelist-optimization

执行前请确认你的 git 配置与 GitHub 账户邮箱一致(DCO 要求 sign-off 邮箱与 commit author 邮箱匹配):

git config user.name "Gao Han"
git config user.email "hgaoaf@connect.ust.hk"

push 之后 DCO 检查会自动重跑通过。

备注:如果你希望我直接通过 API 帮你修复,需要你授权 vllm-omni 仓库的写权限给我(Coding Agent),这样我可以新建一个带 sign-off 的 commit 并更新分支引用。是否需要?

User: 需要

Assistant: 抱歉,我需要更正一下之前的说法。我重新检查了我可用的工具,发现我无法通过 API 直接修复这个 DCO 问题。原因如下:

  1. 我没有 Git Data API 的写权限:我能用的写操作只有 create_or_update_filepush_files,这两个都会在分支顶端追加新 commit,而不能 amend 已有 commit 或重写 commit message。
  2. DCO 要求 PR 中的每个 commit 都签名:即使我追加一个带 Signed-off-by 的空 commit,原来那个 revert commit 仍然没签名,DCO 还是会失败。
  3. 必须 force-push 重写历史:这个操作只能在本地用 git commit --amend -s + git push --force-with-lease 完成。

推荐方案

方案 A(推荐,最快):本地一行命令搞定

git fetch origin revert-3162-whitelist-optimization && \
git checkout revert-3162-whitelist-optimization && \
git commit --amend --no-edit -s && \
git push --force-with-lease origin revert-3162-whitelist-optimization

方案 B:直接在 GitHub Web UI 上操作

  1. 打开 [CI failed]Revert "[Config Refactor] Derive deploy override fields from stage config" #3287
  2. 关闭这个 PR
  3. 回到 [Config Refactor] Derive deploy override fields from stage config #3162 重新点击 Revert,但不要直接 commit;而是选择 "Open a pull request",然后在分支创建后用方案 A 给那个 commit 补上 sign-off。

实际上 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 处理。它将:

  1. main 创建新分支 revert-3162-whitelist-optimization-signed
  2. 执行 git revert 还原 commit 01ebc0cdf542bb46db90ca8ecb641f26ca9247a0(即原 PR [Config Refactor] Derive deploy override fields from stage config #3162
  3. 在 commit message 上加 Signed-off-by 以满足 DCO
  4. 开一个新 PR,body 中标注 "Closes [CI failed]Revert "[Config Refactor] Derive deploy override fields from stage config" #3287"

任务进展可在 https://github...

This pull request was created from Copilot chat.

…nfig (#3162)"

This reverts commit 01ebc0c.

Signed-off-by: GitHub <noreply@github.com>

Co-authored-by: Gaohan123 <20148503+Gaohan123@users.noreply.github.com>
Copilot stopped work on behalf of Gaohan123 due to an error April 30, 2026 22:49
Copilot AI requested a review from Gaohan123 April 30, 2026 22:49
@Gaohan123 Gaohan123 closed this Apr 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants