FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

test: replace string-concatenation with template-literals by cleong-tc · Pull Request #15903 · nodejs/node · GitHub

/ node Public

test: replace string-concatenation with template-literals - #15903

Closed
cleong-tc wants to merge 1 commit into
nodejs:masterfrom
cleong-tc:master
Closed

test: replace string-concatenation with template-literals#15903
cleong-tc wants to merge 1 commit into
nodejs:masterfrom
cleong-tc:master

Conversation

cleong-tc commented Oct 6, 2017
edited
Loading

Copy link
Copy Markdown
Contributor
Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

nodejs-github-bot added build Issues and PRs related to build files or the CI. libuv Issues and PRs related to the libuv dependency or the uv binding. labels Oct 6, 2017

mscdex commented Oct 6, 2017

Copy link
Copy Markdown
Contributor

Also, this appears to have other changes mixed in (notably the libuv upgrade commit) that need to be removed first.

mscdex added test Issues and PRs related to the tests. whatwg-url Issues and PRs related to the WHATWG URL implementation. and removed build Issues and PRs related to build files or the CI. libuv Issues and PRs related to the libuv dependency or the uv binding. labels Oct 6, 2017
Trott added the code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. label Oct 6, 2017

gibfahn commented Oct 7, 2017

Copy link
Copy Markdown
Member

@colin-tucows this PR seems to have somehow picked up a commit that was already in master.

If you are comfortable enough with git to update your branch to remove that commit then great, otherwise I think that can be cleared up on landing.

Copy link
Copy Markdown
Contributor Author

hi @gibfahn ,

sorry, i will need more guidance on what you mean by 'update your branch to remove that commit' and/or how i should fix this pr. i don't know why commit 75318e4 got mixed up with my pr.

if you prefer to just clean-up this pr for me on landing, that is fine with me too.

thanks,
colin

joyeecheung commented Oct 8, 2017
edited
Loading

Copy link
Copy Markdown
Member

@gibfahn Judging from that mysterious time-travelling ghost comment from Rich, I guess this could be the Github bug came haunting us again.

@colin-tucows I have fixed the commits (with the commit message fixed to follow our commit message guidelines)

Copy link
Copy Markdown
Member

@colin-tucows Also in case you want to know how I fixed it, here are the commands that I used (the "allow edits from maintainer" box is checked in this PR so that is why I can force-push to your fork)

git remote add ct git@github.com:colin-tucows/node.git
git fetch ct master
git checkout -b ct-master
git reset --hard ct/master
git rebase master -i
git branch --set-upstream-to=ct/master
git push --force ct HEAD:master

Copy link
Copy Markdown
Member

BridgeAR self-assigned this Oct 9, 2017
BridgeAR pushed a commit that referenced this pull request Oct 9, 2017
PR-URL: #15903
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Refael Ackermann <refack@gmail.com>

BridgeAR commented Oct 9, 2017

Copy link
Copy Markdown
Member

Landed in d00bb87

Thanks for the PR, and congratulations on becoming a Node.js Contributor 🎉 !

BridgeAR closed this Oct 9, 2017
MylesBorins pushed a commit that referenced this pull request Oct 11, 2017
PR-URL: #15903
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Refael Ackermann <refack@gmail.com>
MylesBorins mentioned this pull request Oct 11, 2017
addaleax pushed a commit to addaleax/ayo that referenced this pull request Oct 12, 2017
PR-URL: nodejs/node#15903
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Refael Ackermann <refack@gmail.com>
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

Labels

code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. test Issues and PRs related to the tests. whatwg-url Issues and PRs related to the WHATWG URL implementation.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants


Back | FazBrowse Home | New Git URL