fixes microsoft#43014

joaomoreno · joaomoreno · commit 2860393643c0 · 2018-02-08T17:10:20.000+01:00
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
@@ -679,7 +679,7 @@ export class Repository {
 		return stdout;
 	}
 
-	async lstree(treeish: string, path: string): Promise<{ mode: number, object: string, size: number }> {
+	async lstree(treeish: string, path: string): Promise<{ mode: string, object: string, size: number }> {
 		if (!treeish) { // index
 			const { stdout } = await this.run(['ls-files', '--stage', '--', path]);
 
@@ -693,7 +693,7 @@ export class Repository {
 			const catFile = await this.run(['cat-file', '-s', object]);
 			const size = parseInt(catFile.stdout);
 
-			return { mode: parseInt(mode), object, size };
+			return { mode, object, size };
 		}
 
 		const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', path]);
@@ -705,7 +705,7 @@ export class Repository {
 		}
 
 		const [, mode, , object, size] = match;
-		return { mode: parseInt(mode), object, size: parseInt(size) };
+		return { mode, object, size: parseInt(size) };
 	}
 
 	async detectObjectType(object: string): Promise<{ mimetype: string, encoding?: string }> {
@@ -787,7 +787,16 @@ export class Repository {
 			});
 		}
 
-		await this.run(['update-index', '--cacheinfo', '100644', hash, path]);
+		let mode: string;
+
+		try {
+			const details = await this.lstree('HEAD', path);
+			mode = details.mode;
+		} catch (err) {
+			mode = '100644';
+		}
+
+		await this.run(['update-index', '--cacheinfo', mode, hash, path]);
 	}
 
 	async checkout(treeish: string, paths: string[]): Promise<void> {
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -798,7 +798,7 @@ export class Repository implements Disposable {
 		});
 	}
 
-	lstree(ref: string, filePath: string): Promise<{ mode: number, object: string, size: number }> {
+	lstree(ref: string, filePath: string): Promise<{ mode: string, object: string, size: number }> {
 		return this.run(Operation.LSTree, () => this.repository.lstree(ref, filePath));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,7 @@ export class Repository {`
`679`	`679`	`return stdout;`
`680`	`680`	`}`
`681`	`681`
`682`		`- async lstree(treeish: string, path: string): Promise<{ mode: number, object: string, size: number }> {`
	`682`	`+ async lstree(treeish: string, path: string): Promise<{ mode: string, object: string, size: number }> {`
`683`	`683`	`if (!treeish) { // index`
`684`	`684`	`const { stdout } = await this.run(['ls-files', '--stage', '--', path]);`
`685`	`685`
`@@ -693,7 +693,7 @@ export class Repository {`
`693`	`693`	`const catFile = await this.run(['cat-file', '-s', object]);`
`694`	`694`	`const size = parseInt(catFile.stdout);`
`695`	`695`
`696`		`- return { mode: parseInt(mode), object, size };`
	`696`	`+ return { mode, object, size };`
`697`	`697`	`}`
`698`	`698`
`699`	`699`	`const { stdout } = await this.run(['ls-tree', '-l', treeish, '--', path]);`
`@@ -705,7 +705,7 @@ export class Repository {`
`705`	`705`	`}`
`706`	`706`
`707`	`707`	`const [, mode, , object, size] = match;`
`708`		`- return { mode: parseInt(mode), object, size: parseInt(size) };`
	`708`	`+ return { mode, object, size: parseInt(size) };`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`async detectObjectType(object: string): Promise<{ mimetype: string, encoding?: string }> {`
`@@ -787,7 +787,16 @@ export class Repository {`
`787`	`787`	`});`
`788`	`788`	`}`
`789`	`789`
`790`		`- await this.run(['update-index', '--cacheinfo', '100644', hash, path]);`
	`790`	`+ let mode: string;`
	`791`	`+`
	`792`	`+ try {`
	`793`	`+ const details = await this.lstree('HEAD', path);`
	`794`	`+ mode = details.mode;`
	`795`	`+ } catch (err) {`
	`796`	`+ mode = '100644';`
	`797`	`+ }`
	`798`	`+`
	`799`	`+ await this.run(['update-index', '--cacheinfo', mode, hash, path]);`
`791`	`800`	`}`
`792`	`801`
`793`	`802`	`async checkout(treeish: string, paths: string[]): Promise<void> {`
Original file line number	Diff line number	Diff line change
`@@ -798,7 +798,7 @@ export class Repository implements Disposable {`
`798`	`798`	`});`
`799`	`799`	`}`
`800`	`800`
`801`		`- lstree(ref: string, filePath: string): Promise<{ mode: number, object: string, size: number }> {`
	`801`	`+ lstree(ref: string, filePath: string): Promise<{ mode: string, object: string, size: number }> {`
`802`	`802`	`return this.run(Operation.LSTree, () => this.repository.lstree(ref, filePath));`
`803`	`803`	`}`
`804`	`804`