Skip to content

fix: use git apply not system apply #432

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 2, 2020
Merged

fix: use git apply not system apply #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions components/git/v8.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,14 @@ function main(argv) {
options.v8Dir = path.resolve(options.v8Dir);
}

options.execGitNode = function execGitNode(...args) {
return execa('git', args, { cwd: options.nodeDir });
options.execGitNode = function execGitNode(cmd, args, input) {
args.unshift(cmd);
return execa('git', args, {
cwd: options.nodeDir,
...input && { input }
});
};

options.execGitV8 = function execGitV8(...args) {
return execa('git', args, { cwd: options.v8Dir });
};
Expand Down
22 changes: 9 additions & 13 deletions lib/update-v8/backport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

const path = require('path');

const execa = require('execa');
const fs = require('fs-extra');
const inquirer = require('inquirer');
const Listr = require('listr');
Expand Down Expand Up @@ -74,8 +73,8 @@ function commitSquashedBackport() {
messageBody += formatted + '\n\n';
}
}
await ctx.execGitNode('add', 'deps/v8');
await ctx.execGitNode('commit', '-m', messageTitle, '-m', messageBody);
await ctx.execGitNode('add', ['deps/v8']);
await ctx.execGitNode('commit', ['-m', messageTitle, '-m', messageBody]);
}
};
};
Expand All @@ -86,8 +85,8 @@ function commitPatch(patch) {
task: async(ctx) => {
const messageTitle = formatMessageTitle([patch]);
const messageBody = formatMessageBody(patch, false);
await ctx.execGitNode('add', 'deps/v8');
await ctx.execGitNode('commit', '-m', messageTitle, '-m', messageBody);
await ctx.execGitNode('add', ['deps/v8']);
await ctx.execGitNode('commit', ['-m', messageTitle, '-m', messageBody]);
}
};
}
Expand Down Expand Up @@ -200,13 +199,10 @@ function applyPatchTask(patch) {

async function applyPatch(ctx, patch) {
try {
await execa(
'patch',
['-p1', '--merge', '--no-backup-if-mismatch', '--directory=deps/v8'],
{
cwd: ctx.nodeDir,
input: patch.data
}
await ctx.execGitNode(
'apply',
['-p1', '--3way', '--directory=deps/v8'],
patch.data /* input */
);
} catch (e) {
patch.hadConflicts = true;
Expand Down Expand Up @@ -246,7 +242,7 @@ function incrementEmbedderVersion() {
commonGypiPath,
commonGypi.replace(embedderRegex, embedderString)
);
await ctx.execGitNode('add', 'common.gypi');
await ctx.execGitNode('add', ['common.gypi']);
}
};
}