Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Modify git add/revert to use splitInChunks

Browse Source
This commit is contained in:
rzj17
2019-11-14 15:44:16 +00:00
committed by Robert Jin
parent a1ed386162
commit 60d906fd57
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extensions/git/src/git.ts
View File

@@ -1226,12 +1226,13 @@ export class Repository {
args.push('--');
if (paths && paths.length) {
args.push.apply(args, paths.map(sanitizePath));
for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
await this.run([...args, ...chunk]);
}
} else {
args.push('.');
await this.run(args);
}
await this.run(args);
}
async rm(paths: string[]): Promise<void> {
@@ -1480,14 +1481,15 @@ export class Repository {
args = ['reset', '-q', treeish, '--'];
}
if (paths && paths.length) {
args.push.apply(args, paths.map(sanitizePath));
} else {
args.push('.');
}
try {
await this.run(args);
if (paths && paths.length > 0) {
for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
await this.run([...args, ...chunk]);
}
} else {
args.push('.');
await this.run(args);
}
} catch (err) {
// In case there are merge conflicts to be resolved, git reset will output
// some "needs merge" data. We try to get around that.