Skip to content

Commit 05fec36

Browse files
authored
Remove usage of parse-git-config (#13416)
1 parent 31ada4a commit 05fec36

File tree

3 files changed

+12
-23
lines changed

3 files changed

+12
-23
lines changed

Extension/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6612,7 +6612,6 @@
66126612
"gulp-typescript": "^5.0.1",
66136613
"minimist": "^1.2.8",
66146614
"mocha": "^10.4.0",
6615-
"parse-git-config": "^3.0.0",
66166615
"parse5": "^7.1.2",
66176616
"parse5-traverse": "^1.0.3",
66186617
"proxyquire": "^2.1.3",

Extension/translations_auto_pr.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
const fs = require("fs-extra");
44
const cp = require("child_process");
55
const path = require('path');
6-
const parseGitConfig = require('parse-git-config');
76

87
const branchName = 'localization';
98
const mergeTo = 'main';
@@ -105,8 +104,8 @@ cp.execSync('git fetch');
105104

106105
// Remove old localization branch, if any
107106
if (hasBranch("localization")) {
108-
console.log(`Remove old localization branch, if any (git branch -D localization)`);
109-
cp.execSync('git branch -D localization');
107+
console.log(`Remove old localization branch, if any (git branch -D localization)`);
108+
cp.execSync('git branch -D localization');
110109
}
111110

112111
// Check out local branch
@@ -128,13 +127,17 @@ if (!hasAnyChanges()) {
128127
// Save existing user name and email, in case already set.
129128
var existingUserName;
130129
var existingUserEmail;
131-
var gitConfigPath = path.resolve(process.cwd(), '../.git/config');
132-
var config = parseGitConfig.sync({ path: gitConfigPath });
133130

134-
if (typeof config === 'object' && config.hasOwnProperty('user')) {
135-
existingUserName = config.user.name;
136-
existingUserEmail = config.user.email;
131+
try {
132+
existingUserName = cp.execSync('git config --local user.name', { encoding: 'utf8', cwd: process.cwd() }).trim() || undefined
133+
} catch {
134+
}
135+
136+
try {
137+
existingUserEmail = cp.execSync('git config --local user.email', { encoding: 'utf8', cwd: process.cwd() }).trim() || undefined
138+
} catch {
137139
}
140+
138141
if (existingUserName === undefined) {
139142
console.log(`Existing user name: undefined`);
140143
} else {

Extension/yarn.lock

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2430,11 +2430,6 @@ get-symbol-description@^1.1.0:
24302430
es-errors "^1.3.0"
24312431
get-intrinsic "^1.2.6"
24322432

2433-
git-config-path@^2.0.0:
2434-
version "2.0.0"
2435-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/git-config-path/-/git-config-path-2.0.0.tgz#62633d61af63af4405a5024efd325762f58a181b"
2436-
integrity sha1-YmM9Ya9jr0QFpQJO/TJXYvWKGBs=
2437-
24382433
glob-parent@^3.1.0, glob-parent@^5.1.2, glob-parent@~5.1.2:
24392434
version "5.1.2"
24402435
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -2798,7 +2793,7 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
27982793
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
27992794
integrity sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=
28002795

2801-
ini@^1.3.4, ini@^1.3.5:
2796+
ini@^1.3.4:
28022797
version "1.3.8"
28032798
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
28042799
integrity sha1-op2kJbSIBvNHZ6Tvzjlyaa8oQyw=
@@ -3773,14 +3768,6 @@ parse-filepath@^1.0.2:
37733768
map-cache "^0.2.0"
37743769
path-root "^0.1.1"
37753770

3776-
parse-git-config@^3.0.0:
3777-
version "3.0.0"
3778-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/parse-git-config/-/parse-git-config-3.0.0.tgz#4a2de08c7b74a2555efa5ae94d40cd44302a6132"
3779-
integrity sha1-Si3gjHt0olVe+lrpTUDNRDAqYTI=
3780-
dependencies:
3781-
git-config-path "^2.0.0"
3782-
ini "^1.3.5"
3783-
37843771
parse-imports@^2.1.1:
37853772
version "2.2.1"
37863773
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/parse-imports/-/parse-imports-2.2.1.tgz#0a6e8b5316beb5c9905f50eb2bbb8c64a4805642"

0 commit comments

Comments
 (0)