Skip to content

can't handle empty commit even by cli #619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gengjiawen opened this issue Apr 10, 2022 · 0 comments · Fixed by #681
Closed

can't handle empty commit even by cli #619

gengjiawen opened this issue Apr 10, 2022 · 0 comments · Fixed by #681

Comments

@gengjiawen
Copy link
Member

gengjiawen commented Apr 10, 2022

Commit Queue failed
- Loading data for nodejs/node/pull/42109
✔  Done loading data for nodejs/node/pull/42109
----------------------------------- PR info ------------------------------------
Title      build: add configure option --v8-enable-short-builtin-calls (#42109)
Author     daomingq  (@qdaoming-intel, first-time contributor)
Branch     qdaoming-intel:daomingq-v8-short-builtin-calls-support -> nodejs:master
Labels     build, v8 engine, tools, performance, needs-ci, commit-queue-squash
Commits    3
 - build: Add configure option --v8-enable-short-builtin-calls
 - build: add configure option --v8-enable-short-builtin-calls
 - Merge branch 'daomingq-v8-short-builtin-calls-support' of https://git…
Committers 1
 - Daoming Qiu 
PR-URL: https://github.com/nodejs/node/pull/42109
Reviewed-By: Michaël Zasso 
Reviewed-By: Jiawen Geng 
Reviewed-By: James M Snell 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/42109
Reviewed-By: Michaël Zasso 
Reviewed-By: Jiawen Geng 
Reviewed-By: James M Snell 
--------------------------------------------------------------------------------
   ℹ  This PR was created on Thu, 24 Feb 2022 11:36:12 GMT
   ✔  Approvals: 3
   ✔  - Michaël Zasso (@targos) (TSC): https://github.com/nodejs/node/pull/42109#pullrequestreview-894401846
   ✔  - Jiawen Geng (@gengjiawen): https://github.com/nodejs/node/pull/42109#pullrequestreview-894480850
   ✔  - James M Snell (@jasnell) (TSC): https://github.com/nodejs/node/pull/42109#pullrequestreview-902332596
   ✔  Last GitHub CI successful
   ℹ  Last Full PR CI on 2022-04-08T01:59:47Z: https://ci.nodejs.org/job/node-test-pull-request/43380/
   ℹ  Last Benchmark CI on 2022-04-08T01:59:47Z: https://ci.nodejs.org/view/Node.js%20benchmark/job/benchmark-node-micro-benchmarks/1099/
- Querying data for job/node-test-pull-request/43380/
   ✔  Last Jenkins CI successful
--------------------------------------------------------------------------------
   ✔  No git cherry-pick in progress
   ✔  No git am in progress
   ✔  No git rebase in progress
--------------------------------------------------------------------------------
- Bringing origin/master up to date...
From https://github.com/nodejs/node
 * branch                  master     -> FETCH_HEAD
✔  origin/master is now up-to-date
- Downloading patch for 42109
From https://github.com/nodejs/node
 * branch                  refs/pull/42109/merge -> FETCH_HEAD
✔  Fetched commits as 3c752648d4ef..1c07e9c014fe
--------------------------------------------------------------------------------
Auto-merging configure.py
[master 929a24cfd3] build: Add configure option --v8-enable-short-builtin-calls
 Author: Daoming Qiu 
 Date: Thu Feb 24 19:32:19 2022 +0800
 2 files changed, 15 insertions(+)
Auto-merging configure.py
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)

Cherry-pick currently in progress.
(run "git cherry-pick --continue" to continue)
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)

Untracked files:
(use "git add ..." to include in what will be committed)
labels.json
output

nothing added to commit but untracked files present (use "git add" to track)
✖ Failed to apply patches

https://github.com/nodejs/node/actions/runs/2112713844

Originally posted by @nodejs-github-bot in nodejs/node#42109 (comment)

git node land 42109 also failed.

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 a pull request may close this issue.

1 participant