docs: "s/git apply/git am -3" in V8 guide #10665
Closed
Conversation
This file contains 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
MylesBorins
force-pushed
the
update-V8-guide
branch
from
546b0e5
to
91704b8
Compare
targos
reviewed
Jan 6, 2017
| * Download and apply the commit linked-to in the issue (in this case a51f429). `curl -L https://github.com/v8/v8/commit/a51f429.patch | git apply --directory=deps/v8`. If the branches have diverged significantly, this may not apply cleanly. It may help to try to cherry-pick the merge to the oldest branch that was done upstream in V8. In this example, this would be the patch from the merge to 5.2. The hope is that this would be closer to the V8 5.1, and has a better chance of applying cleanly. If you're stuck, feel free to ping @ofrobots for help. | ||
| * Modify the commit message to match the format we use for V8 backports. You may want to add extra description if necessary to indicate the impact of the fix on Node.js. In this case the original issue was descriptive enough. Example: | ||
| * Download and apply the commit linked-to in the issue (in this case a51f429). `curl -L https://github.com/v8/v8/commit/a51f429.patch | git am -3 --directory=deps/v8`. If the branches have diverged significantly, this may not apply cleanly. It may help to try to cherry-pick the merge to the oldest branch that was done upstream in V8. In this example, this would be the patch from the merge to 5.2. The hope is that this would be closer to the V8 5.1, and has a better chance of applying cleanly. If you're stuck, feel free to ping @ofrobots for help. | ||
| * Modify the commit message to match the format we use for V8 backports. `git commit --amend` You may want to add extra description if necessary to indicate the impact of the fix on Node.js. In this case the original issue was descriptive enough. Example: |
There was a problem hiding this comment.
It seems something is missing after "git commit --amend"
There was a problem hiding this comment.
I've added `--author="First Last your@email.address"
That should just work afaik
There was a problem hiding this comment.
It's not what I meant, but I'd suggest --reset-author.
My comment was about the placement of the command in the text. Maybe add a period after it?
MylesBorins
force-pushed
the
update-V8-guide
branch
2 times, most recently
from
4847afd
to
544d7ff
Compare
jasnell
approved these changes
Jan 6, 2017
gibfahn
approved these changes
Jan 6, 2017
|
Should it be |
targos
approved these changes
Jan 6, 2017
git apply does not preserve the original commit message. These updated instructions offer a simpler flow for backporting.
MylesBorins
force-pushed
the
update-V8-guide
branch
from
544d7ff
to
f5c22b2
Compare
jasnell
pushed a commit
that referenced
this pull request
Jan 10, 2017
git apply does not preserve the original commit message. These updated instructions offer a simpler flow for backporting. PR-URL: #10665 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Michal Zasso <targos@protonmail.com>
|
Landed in db14687 |
italoacasas
pushed a commit
to italoacasas/node
that referenced
this pull request
Jan 18, 2017
git apply does not preserve the original commit message. These updated instructions offer a simpler flow for backporting. PR-URL: nodejs#10665 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Michal Zasso <targos@protonmail.com>
italoacasas
pushed a commit
to italoacasas/node
that referenced
this pull request
Jan 23, 2017
git apply does not preserve the original commit message. These updated instructions offer a simpler flow for backporting. PR-URL: nodejs#10665 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Michal Zasso <targos@protonmail.com>
italoacasas
pushed a commit
to italoacasas/node
that referenced
this pull request
Jan 24, 2017
git apply does not preserve the original commit message. These updated instructions offer a simpler flow for backporting. PR-URL: nodejs#10665 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Michal Zasso <targos@protonmail.com>
italoacasas
pushed a commit
to italoacasas/node
that referenced
this pull request
Jan 27, 2017
git apply does not preserve the original commit message. These updated instructions offer a simpler flow for backporting. PR-URL: nodejs#10665 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Michal Zasso <targos@protonmail.com>
Merged
MylesBorins
added a commit
that referenced
this pull request
Mar 7, 2017
git apply does not preserve the original commit message. These updated instructions offer a simpler flow for backporting. PR-URL: #10665 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Michal Zasso <targos@protonmail.com>
MylesBorins
added a commit
that referenced
this pull request
Mar 7, 2017
git apply does not preserve the original commit message. These updated instructions offer a simpler flow for backporting. PR-URL: #10665 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Michal Zasso <targos@protonmail.com>
MylesBorins
added a commit
that referenced
this pull request
Mar 9, 2017
git apply does not preserve the original commit message. These updated instructions offer a simpler flow for backporting. PR-URL: #10665 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Michal Zasso <targos@protonmail.com>
Merged
MylesBorins
added a commit
that referenced
this pull request
Mar 9, 2017
git apply does not preserve the original commit message. These updated instructions offer a simpler flow for backporting. PR-URL: #10665 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Michal Zasso <targos@protonmail.com>
Merged
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.
git apply does not preserve the original commit message. These updated
instructions offer a simpler flow for backporting.