💄

joaomoreno · joaomoreno · commit 8cce062aaff3 · 2020-05-27T15:27:13.000+02:00
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
@@ -1223,15 +1223,12 @@ export class Repository {
 			args.push('-A');
 		}
 
-		args.push('--');
-
 		if (paths && paths.length) {
 			for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
-				await this.run([...args, ...chunk]);
+				await this.run([...args, '--', ...chunk]);
 			}
 		} else {
-			args.push('.');
-			await this.run(args);
+			await this.run([...args, '--', '.']);
 		}
 	}
 
@@ -1441,10 +1438,11 @@ export class Repository {
 
 		const limiter = new Limiter(5);
 		const promises: Promise<any>[] = [];
+		const args = ['clean', '-f', '-q'];
 
 		for (const paths of groups) {
 			for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
-				promises.push(limiter.queue(() => this.run(['clean', '-f', '-q', '--', ...chunk])));
+				promises.push(limiter.queue(() => this.run([...args, '--', ...chunk])));
 			}
 		}
 
@@ -1476,19 +1474,18 @@ export class Repository {
 
 		// In case there are no branches, we must use rm --cached
 		if (!result.stdout) {
-			args = ['rm', '--cached', '-r', '--'];
+			args = ['rm', '--cached', '-r'];
 		} else {
-			args = ['reset', '-q', treeish, '--'];
+			args = ['reset', '-q', treeish];
 		}
 
 		try {
 			if (paths && paths.length > 0) {
 				for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {
-					await this.run([...args, ...chunk]);
+					await this.run([...args, '--', ...chunk]);
 				}
 			} else {
-				args.push('.');
-				await this.run(args);
+				await this.run([...args, '--', '.']);
 			}
 		} catch (err) {
 			// In case there are merge conflicts to be resolved, git reset will output
@@ -1977,10 +1974,10 @@ export class Repository {
 	}
 
 	async updateSubmodules(paths: string[]): Promise<void> {
-		const args = ['submodule', 'update', '--'];
+		const args = ['submodule', 'update'];
 
 		for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
-			await this.run([...args, ...chunk]);
+			await this.run([...args, '--', ...chunk]);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1223,15 +1223,12 @@ export class Repository {`
`1223`	`1223`	`args.push('-A');`
`1224`	`1224`	`}`
`1225`	`1225`
`1226`		`- args.push('--');`
`1227`		`-`
`1228`	`1226`	`if (paths && paths.length) {`
`1229`	`1227`	`for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {`
`1230`		`- await this.run([...args, ...chunk]);`
	`1228`	`+ await this.run([...args, '--', ...chunk]);`
`1231`	`1229`	`}`
`1232`	`1230`	`} else {`
`1233`		`- args.push('.');`
`1234`		`- await this.run(args);`
	`1231`	`+ await this.run([...args, '--', '.']);`
`1235`	`1232`	`}`
`1236`	`1233`	`}`
`1237`	`1234`
`@@ -1441,10 +1438,11 @@ export class Repository {`
`1441`	`1438`
`1442`	`1439`	`const limiter = new Limiter(5);`
`1443`	`1440`	`const promises: Promise<any>[] = [];`
	`1441`	`+ const args = ['clean', '-f', '-q'];`
`1444`	`1442`
`1445`	`1443`	`for (const paths of groups) {`
`1446`	`1444`	`for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {`
`1447`		`- promises.push(limiter.queue(() => this.run(['clean', '-f', '-q', '--', ...chunk])));`
	`1445`	`+ promises.push(limiter.queue(() => this.run([...args, '--', ...chunk])));`
`1448`	`1446`	`}`
`1449`	`1447`	`}`
`1450`	`1448`
`@@ -1476,19 +1474,18 @@ export class Repository {`
`1476`	`1474`
`1477`	`1475`	`// In case there are no branches, we must use rm --cached`
`1478`	`1476`	`if (!result.stdout) {`
`1479`		`- args = ['rm', '--cached', '-r', '--'];`
	`1477`	`+ args = ['rm', '--cached', '-r'];`
`1480`	`1478`	`} else {`
`1481`		`- args = ['reset', '-q', treeish, '--'];`
	`1479`	`+ args = ['reset', '-q', treeish];`
`1482`	`1480`	`}`
`1483`	`1481`
`1484`	`1482`	`try {`
`1485`	`1483`	`if (paths && paths.length > 0) {`
`1486`	`1484`	`for (const chunk of splitInChunks(paths, MAX_CLI_LENGTH)) {`
`1487`		`- await this.run([...args, ...chunk]);`
	`1485`	`+ await this.run([...args, '--', ...chunk]);`
`1488`	`1486`	`}`
`1489`	`1487`	`} else {`
`1490`		`- args.push('.');`
`1491`		`- await this.run(args);`
	`1488`	`+ await this.run([...args, '--', '.']);`
`1492`	`1489`	`}`
`1493`	`1490`	`} catch (err) {`
`1494`	`1491`	`// In case there are merge conflicts to be resolved, git reset will output`
`@@ -1977,10 +1974,10 @@ export class Repository {`
`1977`	`1974`	`}`
`1978`	`1975`
`1979`	`1976`	`async updateSubmodules(paths: string[]): Promise<void> {`
`1980`		`- const args = ['submodule', 'update', '--'];`
	`1977`	`+ const args = ['submodule', 'update'];`
`1981`	`1978`
`1982`	`1979`	`for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {`
`1983`		`- await this.run([...args, ...chunk]);`
	`1980`	`+ await this.run([...args, '--', ...chunk]);`
`1984`	`1981`	`}`
`1985`	`1982`	`}`
`1986`	`1983`