Conversation
|
@kiyomizumia Do you think you could rebase out the merge commits here, and/or squash the commits together? Our CI doesn’t play too well with merge commits, sadly :/ |
|
@kiyomizumia I think something went wrong when rebasing here… I think this should work: $ git checkout cppcode
$ git fetch upstream
$ git rebase -i upstream/master
# delete all lines except the last 2 ones (your commits)
$ git push --force-with-leaseCould you try that? |
test: fixed order of actual and expected arguments src: ifdef changes src: refactored and removed some ifdef debug statements
|
@addaleax I should remove all of the commits except mine, correct? There are quite a few of them... |
|
@kiyomizumia Yes, correct… the last one in this PR (07c92d3) seems to be a bit odd and should probably be left out, but since there are no merge commits anymore, I think we can run CI: |
joyeecheung
left a comment
There was a problem hiding this comment.
CI is happy. Whoever lands this be sure to leave out the first commit.
joyeecheung
left a comment
There was a problem hiding this comment.
BTW it's the last commit that needs to be dropped..also, the first two commits looks a bit odd - the first one not only adds the macro but also drops #ifdef DEBUG in base_object-inl.h without making the CHECKs DCHECK, while the second commit also contains whitespace changes to util.h. I'd suggest either squash them all into one commit during landing, or use some git magic to split into two commits where one only contains changes to util.h and the other one contains other changes to src.
|
Ping @kiyomizumia , do you have time to add the missing endif? (I believe you can just click the apply suggestion button in #24359 (comment) instead of making the change locally and pushing again) |
|
Ping @kiyomizumia again...if you don't mind can I push to the PR branch? I want to get this landed so that DCHECK macros can be used in the code base. |
|
@joyeecheung Okay, go ahead! |
Co-Authored-By: kiyomizumia <42000558+kiyomizumia@users.noreply.github.com>
|
Thanks! New CI: https://ci.nodejs.org/job/node-test-pull-request/19306/ |
|
Resume Build CI; https://ci.nodejs.org/job/node-test-pull-request/19778/ ✔️ |
This adds check statements for debugging and refactors the code accordingly. PR-URL: nodejs#24359 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
|
Landed in 71bc7e1 🎉 |
This adds check statements for debugging and refactors the code accordingly. PR-URL: #24359 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This adds check statements for debugging and refactors the code accordingly. PR-URL: #24359 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This adds check statements for debugging and refactors the code accordingly. PR-URL: nodejs#24359 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Refactored and removed some debug #ifdef statements.