@gitkraken/core-gitlens 0.24.0 → 0.26.0

package/dist/git-cli/exec/git.js

@@ -9,14 +9,13 @@ import { arePathsEqual, dirname as dirname$1, isAbsolute as isAbsolute$1, isDesc
 import { GitWarnings, WorkspaceUntrustedError, getGitWarning } from "../../git/errors.js";
 import { gitFeaturesByVersion } from "../../git/features.js";
 import { getChangesForCommand, leadingCommand } from "./commandClassifier.js";
-import { CancelledRunError, RunError, endStdin, fsExists, runSpawn } from "../../utils/env/node/exec.js";
+import { CancelledRunError, RunError, endStdin, fsExists, runSpawn, spawnProcess } from "../../utils/env/node/exec.js";
 import { compare, fromString } from "../../utils/version.js";
 import { EventLoopMonitor } from "./eventLoopMonitor.js";
 import { GitQueue, getPrimaryGitCommand, inferGitCommandPriority } from "./gitQueue.js";
 import { getMovedHead } from "./headState.js";
 import { KeyedSequencer, isConfigCommand, isIndexWriteCommand, retryWhileConfigLocked, retryWhileIndexLocked, toExitCode } from "./indexLock.js";
 import { resolve } from "path";
-import { spawn } from "child_process";
 import * as process from "process";
 //#region ../git-cli/src/exec/git.ts
 const slowCallWarningThreshold = 2e3;
@@ -108,6 +107,7 @@ const GitErrors = {
 	noUserNameConfigured: /Please tell me who you are\./i,
 	nothingToCommit: /nothing(?: added)? to commit|no changes added to commit/i,
 	noPausedOperation: /no merge (?:in progress|to abort)|no cherry-pick(?: or revert)? in progress|no rebase in progress/i,
+	pathspecRefused: /pathspec '.*' is (?:beyond a symbolic link|in submodule)|' is outside repository|empty string is not a valid pathspec/is,
 	permissionDenied: /Permission.*denied/i,
 	previousOperationEmpty: /The previous (?:cherry-pick|revert) is now empty/i,
 	problemWithEditor: /there was a problem with the editor/i,
@@ -531,6 +531,10 @@ var Git = class {
 		} : this.getBaseEnv();
 		return this._fullEnv;
 	}
+	/** The environment git runs with, before a run's own `env` */
+	getRunEnvironment() {
+		return this.getFullEnv();
+	}
 	/**
 	* Builds the environment for a git command. Returns the cached full env
 	* directly when there are no per-call overrides (the common case).
@@ -945,7 +949,7 @@ var Git = class {
 		runArgs.unshift("-c", "core.quotepath=false", "-c", "color.ui=false", ...configs ?? emptyArray);
 		if (process.platform === "win32") runArgs.unshift("-c", "core.longpaths=true");
 		const command = await this.path();
-		const proc = (this.options.spawn ?? spawn)(command, runArgs, spawnOpts);
+		const proc = (this.options.spawn ?? spawnProcess)(command, runArgs, spawnOpts);
 		if (stdin) endStdin(proc.stdin, stdin, stdinEncoding);
 		let exception;
 		const promise = new Promise((resolve, reject) => {
@@ -1089,7 +1093,7 @@ var Git = class {
 				if (result.stdout.trim() === "true") {
 					const result = await this.rev_parse__git_dir(cwd).catch(() => void 0);
 					const repoPath = result?.commonPath ?? result?.path;
-					if (repoPath?.length) return [true, repoPath];
+					if (repoPath?.length) return [true, await this.rev_parse__work_tree_of_git_dir(repoPath) ?? repoPath];
 				}
 			}
 			if (inDotGit || ex.original?.code === "ENOENT") {
@@ -1107,6 +1111,21 @@ var Git = class {
 			return emptyArray;
 		}
 	}
+	/**
+	* Returns the working tree in `gitDir`'s parent folder that uses `gitDir` as its git dir, if any.
+	* Inside the git dir of a non-bare repo whose config lacks `core.bare`, git guesses the repo is bare
+	*/
+	async rev_parse__work_tree_of_git_dir(gitDir) {
+		const parent = dirname$1(gitDir);
+		if (parent === gitDir) return void 0;
+		const [toplevel, parentGitDir] = (await this.run({
+			cwd: parent,
+			errors: "ignore"
+		}, "rev-parse", "--show-toplevel", "--git-dir")).stdout.split("\n").map((r) => r.trimStart());
+		if (!toplevel || !parentGitDir) return void 0;
+		if (!arePathsEqual(isAbsolute$1(parentGitDir) ? parentGitDir : joinPaths(parent, parentGitDir), gitDir)) return;
+		return normalizePath(toplevel);
+	}
 	logGitCommandStart(command, id) {
 		_logger.info(`${formatLoggableScopeBlock(`GIT:\u2192${id}`)} ${command} \u00b7 starting...`);
 		this.options.logger?.info(`${formatLoggableScopeBlock(`\u2192${id}`, "")} ${command} \u2022 starting...`);