miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix(core): properly diff json from the merge-base (#15476)

Browse Source
This commit is contained in:
Jason Jean 2023-03-06 13:54:20 -05:00 committed by GitHub
parent 7d25c69579
commit ffac350e27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/nx/src/utils/command-line-utils.ts
View File

@ -166,6 +166,10 @@ export function splitArgsIntoNxArgsAndOverrides(
});
}
}
if (nxArgs.base) {
nxArgs.base = getMergeBase(nxArgs.base, nxArgs.head);
}
}
if (!nxArgs.skipNxCache) {
@ -231,25 +235,33 @@ function getUntrackedFiles(): string[] {
return parseGitOutput(`git ls-files --others --exclude-standard`);
}
function getFilesUsingBaseAndHead(base: string, head: string): string[] {
let mergeBase: string;
function getMergeBase(base: string, head: string = 'HEAD') {
try {
mergeBase = execSync(`git merge-base "${base}" "${head}"`, {
return execSync(`git merge-base "${base}" "${head}"`, {
maxBuffer: TEN_MEGABYTES,
cwd: workspaceRoot,
stdio: 'pipe',
})
.toString()
.trim();
} catch {
mergeBase = execSync(`git merge-base --fork-point "${base}" "${head}"`, {
maxBuffer: TEN_MEGABYTES,
cwd: workspaceRoot,
})
.toString()
.trim();
try {
return execSync(`git merge-base --fork-point "${base}" "${head}"`, {
maxBuffer: TEN_MEGABYTES,
cwd: workspaceRoot,
stdio: 'pipe',
})
.toString()
.trim();
} catch {
return base;
}
}
}
function getFilesUsingBaseAndHead(base: string, head: string): string[] {
return parseGitOutput(
`git diff --name-only --no-renames --relative "${mergeBase}" "${head}"`
`git diff --name-only --no-renames --relative "${base}" "${head}"`
);
}