dugite 3.0.0-rc1 → 3.0.0-rc3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -97,27 +97,23 @@ exports.resolveGitExecPath = resolveGitExecPath;
|
|
|
97
97
|
* @param additional options to include with the process
|
|
98
98
|
*/
|
|
99
99
|
function setupEnvironment(environmentVariables) {
|
|
100
|
+
// This will get Path, pATh, PATH et all on Windows
|
|
101
|
+
const PATH = process.env.PATH;
|
|
100
102
|
const env = {
|
|
101
|
-
|
|
103
|
+
// Merge all of process.env except Path, PATH, et all, we'll add that in just a sec
|
|
104
|
+
...Object.fromEntries(Object.entries(process.env).filter(([k]) => k.toUpperCase() !== 'PATH')),
|
|
105
|
+
// Ensure PATH is always set in upper case not process.env.Path like can
|
|
106
|
+
// be on case-insensitive Windows
|
|
107
|
+
...(PATH ? { PATH } : {}),
|
|
102
108
|
...environmentVariables,
|
|
103
109
|
};
|
|
104
110
|
const gitLocation = resolveGitBinary(env);
|
|
105
111
|
const gitDir = resolveGitDir(env);
|
|
106
112
|
if (process.platform === 'win32') {
|
|
107
113
|
const mingw = process.arch === 'x64' ? 'mingw64' : 'mingw32';
|
|
108
|
-
env.PATH = `${gitDir}\\${mingw}\\bin;${gitDir}\\${mingw}\\usr\\bin;${env.PATH}`;
|
|
114
|
+
env.PATH = `${gitDir}\\${mingw}\\bin;${gitDir}\\${mingw}\\usr\\bin;${env.PATH ?? ''}`;
|
|
109
115
|
}
|
|
110
116
|
env.GIT_EXEC_PATH = resolveGitExecPath(env);
|
|
111
|
-
if (process.platform === 'win32') {
|
|
112
|
-
// while reading the environment variable is case-insensitive
|
|
113
|
-
// you can create a hash with multiple values, which means the
|
|
114
|
-
// wrong value might be used when spawning the child process
|
|
115
|
-
//
|
|
116
|
-
// this ensures we only ever supply one value for PATH
|
|
117
|
-
if (env.Path) {
|
|
118
|
-
delete env.Path;
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
117
|
// On Windows the contained Git environment (minGit) ships with a system level
|
|
122
118
|
// gitconfig that we can control but on macOS and Linux /etc/gitconfig is used
|
|
123
119
|
// as the system-wide configuration file and we're unable to modify it.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-environment.js","sourceRoot":"","sources":["../../lib/git-environment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4B;AAE5B,SAAgB,qBAAqB;IACnC,IACE,OAAO,CAAC,QAAQ,KAAK,QAAQ;QAC7B,OAAO,CAAC,QAAQ,KAAK,OAAO;QAC5B,OAAO,CAAC,QAAQ,KAAK,SAAS;QAC9B,OAAO,CAAC,QAAQ,KAAK,OAAO,EAC5B,CAAC;QACD,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAA;QAClB,OAAO,IAAI;aACR,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;aACrC,OAAO,CAAC,sBAAsB,EAAE,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;IACjE,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AACvE,CAAC;AAbD,sDAaC;AAED;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,GAAuC;IACnE,IAAI,GAAG,CAAC,mBAAmB,IAAI,IAAI,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAC9C,CAAC;SAAM,CAAC;QACN,OAAO,qBAAqB,EAAE,CAAA;IAChC,CAAC;AACH,CAAC;AAND,sCAMC;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,GAAuC;IAEvC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;IACjC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;IAC5C,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;IACxC,CAAC;AACH,CAAC;AATD,4CASC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAChC,GAAuC;IAEvC,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IACxC,CAAC;IACD,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;IACjC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;QAC5D,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IAC5D,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IACjD,CAAC;AACH,CAAC;AAhBD,gDAgBC;AAED;;;;;;;GAOG;AACH,SAAgB,gBAAgB,CAC9B,oBAAwD;IAKxD,MAAM,GAAG,GAAuC;QAC9C,GAAG,OAAO,CAAC,GAAG;
|
|
1
|
+
{"version":3,"file":"git-environment.js","sourceRoot":"","sources":["../../lib/git-environment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4B;AAE5B,SAAgB,qBAAqB;IACnC,IACE,OAAO,CAAC,QAAQ,KAAK,QAAQ;QAC7B,OAAO,CAAC,QAAQ,KAAK,OAAO;QAC5B,OAAO,CAAC,QAAQ,KAAK,SAAS;QAC9B,OAAO,CAAC,QAAQ,KAAK,OAAO,EAC5B,CAAC;QACD,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAA;QAClB,OAAO,IAAI;aACR,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;aACrC,OAAO,CAAC,sBAAsB,EAAE,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;IACjE,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AACvE,CAAC;AAbD,sDAaC;AAED;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,GAAuC;IACnE,IAAI,GAAG,CAAC,mBAAmB,IAAI,IAAI,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAC9C,CAAC;SAAM,CAAC;QACN,OAAO,qBAAqB,EAAE,CAAA;IAChC,CAAC;AACH,CAAC;AAND,sCAMC;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,GAAuC;IAEvC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;IACjC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;IAC5C,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;IACxC,CAAC;AACH,CAAC;AATD,4CASC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAChC,GAAuC;IAEvC,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IACxC,CAAC;IACD,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;IACjC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;QAC5D,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IAC5D,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IACjD,CAAC;AACH,CAAC;AAhBD,gDAgBC;AAED;;;;;;;GAOG;AACH,SAAgB,gBAAgB,CAC9B,oBAAwD;IAKxD,mDAAmD;IACnD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAA;IAE7B,MAAM,GAAG,GAAuC;QAC9C,mFAAmF;QACnF,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CACxE;QACD,wEAAwE;QACxE,iCAAiC;QACjC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzB,GAAG,oBAAoB;KACxB,CAAA;IAED,MAAM,WAAW,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAA;IACzC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;IAEjC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;QAC5D,GAAG,CAAC,IAAI,GAAG,GAAG,MAAM,KAAK,KAAK,SAAS,MAAM,KAAK,KAAK,cACrD,GAAG,CAAC,IAAI,IAAI,EACd,EAAE,CAAA;IACJ,CAAC;IAED,GAAG,CAAC,aAAa,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAE3C,8EAA8E;IAC9E,8EAA8E;IAC9E,uEAAuE;IACvE,EAAE;IACF,gFAAgF;IAChF,qEAAqE;IACrE,uDAAuD;IACvD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;QAC3D,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAClE,kDAAkD;QAClD,2CAA2C;QAC3C,MAAM,WAAW,GAAG,GAAG,MAAM,2BAA2B,CAAA;QACxD,GAAG,CAAC,gBAAgB,GAAG,WAAW,CAAA;IACpC,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,uDAAuD;QACvD,uDAAuD;QACvD,wDAAwD;QACxD,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;QAEnB,IAAI,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;YACpD,mEAAmE;YACnE,4DAA4D;YAC5D,MAAM,OAAO,GAAG,qBAAqB,EAAE,CAAA;YACvC,MAAM,WAAW,GAAG,GAAG,OAAO,iBAAiB,CAAA;YAC/C,GAAG,CAAC,cAAc,GAAG,WAAW,CAAA;QAClC,CAAC;IACH,CAAC;IAED,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,CAAA;AAC7B,CAAC;AAlED,4CAkEC"}
|