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

Fix staging lines to not corrupt line endings when autocrlf is enabled

Browse Source 
Pass the --path argument to git hash-object so that filters are correctly applied when staging lines. This prevents lines with crlf from being added to files that have autocrlf=true. Old versions of git can complain quite a bit if you get into this state.

From: https://git-scm.com/docs/git-hash-object

```
--path

    Hash object as it were located at the given path. The location of file does not directly influence on the hash value, but path is used to determine what Git filters should be applied to the object before it can be placed to the object database, and, as result of applying filters, the actual blob put into the object database may differ from the given file. This option is mainly useful for hashing temporary files located outside of the working directory or files read from stdin.
```
This commit is contained in:
Samuel Harrington
2017-05-07 00:16:02 -07:00
committed by GitHub
parent 56b341c2e0
commit b3380142b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -566,7 +566,7 @@ export class Repository {
}
async stage(path: string, data: string): Promise<void> {
const child = this.stream(['hash-object', '--stdin', '-w'], { stdio: [null, null, null] });
const child = this.stream(['hash-object', '--stdin', '-w', '--path', path], { stdio: [null, null, null] });
child.stdin.end(data, 'utf8');
const { exitCode, stdout } = await exec(child);
@@ -954,4 +954,4 @@ export class Repository {
return { hash: match[1], message: match[2] };
}
}
}