Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue

extensions/git/package.json

@@ -3,6 +3,7 @@
   "displayName": "%displayName%",
   "description": "%description%",
   "publisher": "vscode",
+  "license": "MIT",
   "version": "1.0.0",
   "engines": {
     "vscode": "^1.5.0"
@@ -20,7 +21,8 @@
   "scripts": {
     "compile": "gulp compile-extension:git",
     "watch": "gulp watch-extension:git",
-    "update-grammar": "node ./build/update-grammars.js"
+    "update-grammar": "node ./build/update-grammars.js",
+    "test": "mocha"
   },
   "contributes": {
     "commands": [
@@ -1458,13 +1460,14 @@
     "jschardet": "^1.6.0",
     "vscode-extension-telemetry": "0.1.1",
     "vscode-nls": "^4.0.0",
+    "vscode-uri": "^2.0.0",
     "which": "^1.3.0"
   },
   "devDependencies": {
     "@types/byline": "4.2.31",
     "@types/file-type": "^5.2.1",
     "@types/mocha": "2.2.43",
-    "@types/node": "^10.12.21",
+    "@types/node": "^10.14.8",
     "@types/which": "^1.0.28",
     "mocha": "^3.2.0"
   }