Skip to content

Commit 19cc1a1

Browse files
authored
Merge pull request #738 from ExpressLRS/fix-git-global-config
Ignore global system git config files
2 parents d0b761a + fdf0fac commit 19cc1a1

File tree

3 files changed

+43
-11
lines changed

3 files changed

+43
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
"regenerator-runtime": "^0.14.1",
347347
"sanitize-filename": "^1.6.3",
348348
"semver": "^7.3.8",
349-
"simple-git": "^3.22.0",
349+
"simple-git": "^3.28.0",
350350
"source-map-support": "^0.5.21",
351351
"ts-node": "^10.9.2",
352352
"type-graphql": "2.0.0-beta.3",

src/api/src/library/FirmwareDownloader/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export class GitFirmwareDownloader implements IFirmwareDownloader {
101101
config: [],
102102
trimmed: false,
103103
};
104-
return simpleGit(options);
104+
return simpleGit(options).env({ ...process.env, GIT_CONFIG_GLOBAL: '' });
105105
}
106106

107107
async clearLocks(directory: string): Promise<void> {

yarn.lock

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5011,6 +5011,13 @@ debug@^3.2.7:
50115011
dependencies:
50125012
ms "^2.1.1"
50135013

5014+
debug@^4.4.0:
5015+
version "4.4.1"
5016+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
5017+
integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
5018+
dependencies:
5019+
ms "^2.1.3"
5020+
50145021
decamelize@^1.2.0:
50155022
version "1.2.0"
50165023
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -8847,7 +8854,7 @@ [email protected]:
88478854
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
88488855
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
88498856

8850-
[email protected], ms@^2.0.0, ms@^2.1.1:
8857+
[email protected], ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
88518858
version "2.1.3"
88528859
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
88538860
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -10519,14 +10526,14 @@ signedsource@^1.0.0:
1051910526
resolved "https://registry.yarnpkg.com/signedsource/-/signedsource-1.0.0.tgz#1ddace4981798f93bd833973803d80d52e93ad6a"
1052010527
integrity sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==
1052110528

10522-
simple-git@^3.22.0:
10523-
version "3.22.0"
10524-
resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.22.0.tgz#616d41c661e30f9c65778956317d422b1729a242"
10525-
integrity sha512-6JujwSs0ac82jkGjMHiCnTifvf1crOiY/+tfs/Pqih6iow7VrpNKRRNdWm6RtaXpvvv/JGNYhlUtLhGFqHF+Yw==
10529+
simple-git@^3.28.0:
10530+
version "3.28.0"
10531+
resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.28.0.tgz#c6345b2e387880f8450788a1e388573366ae48ac"
10532+
integrity sha512-Rs/vQRwsn1ILH1oBUy8NucJlXmnnLeLCfcvbSehkPzbv3wwoFWIdtfd6Ndo6ZPhlPsCZ60CPI4rxurnwAa+a2w==
1052610533
dependencies:
1052710534
"@kwsites/file-exists" "^1.1.1"
1052810535
"@kwsites/promise-deferred" "^1.1.1"
10529-
debug "^4.3.4"
10536+
debug "^4.4.0"
1053010537

1053110538
simple-swizzle@^0.2.2:
1053210539
version "0.2.2"
@@ -10769,7 +10776,16 @@ string-length@^4.0.1:
1076910776
char-regex "^1.0.2"
1077010777
strip-ansi "^6.0.0"
1077110778

10772-
"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
10779+
"string-width-cjs@npm:string-width@^4.2.0":
10780+
version "4.2.3"
10781+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
10782+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
10783+
dependencies:
10784+
emoji-regex "^8.0.0"
10785+
is-fullwidth-code-point "^3.0.0"
10786+
strip-ansi "^6.0.1"
10787+
10788+
"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
1077310789
version "4.2.3"
1077410790
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
1077510791
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10843,7 +10859,14 @@ string_decoder@~1.1.1:
1084310859
dependencies:
1084410860
safe-buffer "~5.1.0"
1084510861

10846-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
10862+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
10863+
version "6.0.1"
10864+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
10865+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
10866+
dependencies:
10867+
ansi-regex "^5.0.1"
10868+
10869+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
1084710870
version "6.0.1"
1084810871
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
1084910872
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -11928,7 +11951,7 @@ winston@^3.11.0:
1192811951
triple-beam "^1.3.0"
1192911952
winston-transport "^4.5.0"
1193011953

11931-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
11954+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
1193211955
version "7.0.0"
1193311956
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
1193411957
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -11946,6 +11969,15 @@ wrap-ansi@^6.2.0:
1194611969
string-width "^4.1.0"
1194711970
strip-ansi "^6.0.0"
1194811971

11972+
wrap-ansi@^7.0.0:
11973+
version "7.0.0"
11974+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
11975+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
11976+
dependencies:
11977+
ansi-styles "^4.0.0"
11978+
string-width "^4.1.0"
11979+
strip-ansi "^6.0.0"
11980+
1194911981
wrap-ansi@^8.1.0:
1195011982
version "8.1.0"
1195111983
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)