ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-01-19 09:45:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adds more protection for uncommitted lines

Browse Source 
Adds better uncommitted hover message in blame annotations
This commit is contained in:
Eric Amodio
2016-09-21 10:54:45 -04:00
parent b047fbc394
commit 157928311e
9 changed files with 67 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/git/git.ts
View File

@@ -7,7 +7,7 @@ import {spawnPromise} from 'spawn-rx';
export * from './gitEnrichment';
export * from './enrichers/blameParserEnricher';
const UncommitedRegex = /^[0]+$/;
const UncommittedRegex = /^[0]+$/;
function gitCommand(cwd: string, ...args) {
return spawnPromise('git', args, { cwd: cwd })
@@ -99,10 +99,11 @@ export default class Git {
const [file, root] = Git.splitPath(Git.normalizePath(fileName), repoPath);
sha = sha.replace('^', '');
if (Git.isUncommitted(sha)) return new Promise<string>((resolve, reject) => reject(new Error(`sha=${sha} is uncommitted`)));
return gitCommand(root, 'show', `${sha}:./${file}`);
}
static isUncommitted(sha: string) {
return UncommitedRegex.test(sha);
return UncommittedRegex.test(sha);
}
}