1.8.2 - Closes waderyan#4 and waderyan#10. Merges waderyan#13

Author: Sertion

.vscodeignore

@@ -1,5 +1,4 @@
 .vscode/**
-typings/**
 out/test/**
 test/**
 src/**

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 1.8.2 (May 14, 2017)
+
+* Bug: Fix incorrect version number in CHANGELOG.md [#13](https://github.com/Sertion/vscode-gitblame/pull/13) (Thanks to [@zackschuster](https://github.com/zackschuster))
+* Fix: Removing `typings` directory
+* Feature: Now respects `git.path` (Thanks to [@alessioalex](https://github.com/alessioalex)) [#4](https://github.com/Sertion/vscode-gitblame/issues/4)
+* Feature: Adding short hash token to `infoMessageFormat` and `statusBarMessageFormat` [#10]
+
 ## 1.8.1 (May 01, 2017)
 
 * Bug: Fix incorrect file name in imports [#9](https://github.com/Sertion/vscode-gitblame/issues/9) (Thanks to [@pftbest](https://github.com/pftbest))

README.md

@@ -24,6 +24,7 @@ See Git Blame information in the status bar for the currently selected line.
   - message that appears when the `extension.blame` command executes (when you click the status bar message)
   - available tokens:
     - `${commit.hash}` - 40-bit hash unique to the commit
+    - `${commit.hash_short,length}` - the first `length` characters of the 40-bit hash unique to the commit, defaults to `7` first characters
     - `${commit.summary}` - the first line of the commit message
     - `${commit.filename}` - the file name where the line was committed
     - `${author.name}` - the commit author's name

package.json

@@ -2,7 +2,7 @@
   "name": "gitblame",
   "displayName": "Git Blame",
   "description": "See git blame information in the status bar.",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "publisher": "waderyan",
   "engines": {
     "vscode": "^1.10.0"
@@ -31,7 +31,7 @@
     "test": "node ./node_modules/vscode/bin/test"
   },
   "dependencies": {
-    "git-blame": "^1.2.0",
+    "git-blame": "^1.4.0",
     "moment": "^2.10.6",
     "object-path": "^0.11.4",
     "valid-url": "^1.0.9"
@@ -47,7 +47,7 @@
   "bugs": {
     "url": "https://github.com/Sertion/vscode-gitblame/issues"
   },
-  "license": "SEE LICENSE IN LICENSE",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/Sertion/vscode-gitblame"

src/extension.ts

@@ -68,7 +68,7 @@ function showMessage(context: ExtensionContext, repoDir: string) {
         }
         else {
             const editor = window.activeTextEditor;
-            
+
             if (!editor) return;
 
             const doc = editor.document;

src/gitblame.ts

@@ -4,8 +4,12 @@ import {workspace, WorkspaceConfiguration} from 'vscode';
 
 export class GitBlame {
     private blamers: Object;
+    private gitPath: string;
 
     constructor() {
+        const gitConfig = workspace.getConfiguration('git');
+
+        this.gitPath = <string>gitConfig.get('path', 'git');
         this.blamers = {};
     }
 
@@ -14,7 +18,7 @@ export class GitBlame {
             return this.blamers[repoPath];
         }
         else {
-            this.blamers[repoPath] = new GitBlameBlamer(repoPath, gitBlameShell);
+            this.blamers[repoPath] = new GitBlameBlamer(repoPath, gitBlameShell, this.gitPath);
             return this.blamers[repoPath];
         }
     }
@@ -26,7 +30,7 @@ export class GitBlameBlamer {
     private _workingOn: Object;
     private _properties: WorkspaceConfiguration;
 
-    constructor(private repoPath: string, private gitBlameProcess) {
+    constructor(private repoPath: string, private gitBlameProcess, private gitPath) {
         this._blamed = {};
         this._workingOn = {};
         this._properties = workspace.getConfiguration('gitblame');
@@ -72,7 +76,7 @@ export class GitBlameBlamer {
                 workTree: workTree,
                 rev: false,
                 ignoreWhitespace: this._properties.get('ignoreWhitespace')
-            }).on('data', (type, data) => {
+            }, this.gitPath).on('data', (type, data) => {
                 // outputs in Porcelain format.
                 if (type === 'line') {
                     blameInfo['lines'][data.finalLine] = data;

src/textdecorator.ts

@@ -78,6 +78,7 @@ export class TextDecorator {
         return {
             'commit': {
                 'hash': commitInfo.hash,
+                'hash_short': (length = 7) => commitInfo.hash.substr(0, length),
                 'summary': commitInfo.summary,
                 'filename': commitInfo.filename
             },