@gitkraken/core-gitlens 0.1.0 → 0.2.0

package/src/git-cli/providers/commits.ts

@@ -27,6 +27,7 @@ import type { DiffRange } from '../../git/providers/types.js';
 import { createUncommittedChangesCommit } from '../../git/utils/commit.utils.js';
 import { isRevisionRange, isSha, isUncommitted, isUncommittedStaged } from '../../git/utils/revision.utils.js';
 import { parseSearchQueryGitCommand } from '../../git/utils/search.utils.js';
+import { compareReachableRefs } from '../../git/utils/sorting.js';
 import { isUserMatch } from '../../git/utils/user.utils.js';
 import { CancellationError, isCancellationError } from '../../utils/cancellation.js';
 import { debug, trace } from '../../utils/decorators/log.js';
@@ -49,7 +50,12 @@ import type {
 	CommitsWithFilesLogParser,
 	ParsedCommit,
 } from '../parsers/logParser.js';
-import { getCommitsLogParser, getShaAndFilesAndStatsLogParser, getShaLogParser } from '../parsers/logParser.js';
+import {
+	getCommitsLogParser,
+	getShaAndDatesLogParser,
+	getShaAndFilesAndStatsLogParser,
+	getShaLogParser,
+} from '../parsers/logParser.js';
 import { getReflogParser, parseGitRefLog } from '../parsers/reflogParser.js';
 import { parseSignatureOutput, signatureFormat } from '../parsers/signatureParser.js';
 import { createCommitFileset } from './commitFilesetUtils.js';
@@ -74,7 +80,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 		message: string,
 		cancellation?: AbortSignal,
 	): Promise<string> {
-		const result = await this.git.exec(
+		const result = await this.git.run(
 			{ cwd: repoPath, cancellation: cancellation, errors: 'throw' },
 			'commit-tree',
 			tree,
@@ -105,7 +111,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 
 	@debug({ exit: true })
 	async getCommitCount(repoPath: string, rev: string, cancellation?: AbortSignal): Promise<number | undefined> {
-		const result = await this.git.exec(
+		const result = await this.git.run(
 			{ cwd: repoPath, cancellation: cancellation, errors: 'ignore' },
 			'rev-list',
 			'--count',
@@ -123,11 +129,52 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 		return isNaN(count) ? undefined : count;
 	}
 
+	@debug({ exit: true })
+	async getCommitDates(
+		repoPath: string,
+		rev: string,
+		cancellation?: AbortSignal,
+	): Promise<{ authorDate: Date; committerDate: Date } | undefined> {
+		const parser = getShaAndDatesLogParser();
+		const result = await this.git.run(
+			{
+				cwd: repoPath,
+				cancellation: cancellation,
+				errors: 'ignore',
+				// Why: full SHAs identify immutable commits (5-min TTL is safe). Non-SHA refs rely on
+				// gitResults being cleared on 'head'/'heads'/'remotes' events; the 60s TTL is the
+				// failsafe for watcher latency / web (no fs watcher).
+				caching: {
+					cache: this.cache.gitResults,
+					options: { accessTTL: isSha(rev) ? 5 * 60 * 1000 : 60 * 1000 },
+				},
+			},
+			'log',
+			'-1',
+			...parser.arguments,
+			rev,
+		);
+		if (result.cancelled || cancellation?.aborted) return undefined;
+
+		for (const entry of parser.parse(result.stdout)) {
+			const authorSeconds = Number(entry.authorDate);
+			const committerSeconds = Number(entry.committerDate);
+			if (!Number.isFinite(authorSeconds) || !Number.isFinite(committerSeconds)) return undefined;
+			return {
+				authorDate: new Date(authorSeconds * 1000),
+				committerDate: new Date(committerSeconds * 1000),
+			};
+		}
+		return undefined;
+	}
+
 	@debug()
 	async getCommitFiles(repoPath: string, rev: string, cancellation?: AbortSignal): Promise<GitFileChange[]> {
 		const parser = getShaAndFilesAndStatsLogParser();
-		const result = await this.git.exec(
-			{ cwd: repoPath, cancellation: cancellation, configs: gitConfigsLog },
+		const result = await this.git.run(
+			// Single-commit log is cheap and almost always serves a user-initiated read; override
+			// the inferred 'background' priority so it doesn't queue behind heavier graph/log work.
+			{ cwd: repoPath, cancellation: cancellation, configs: gitConfigsLog, priority: 'normal' },
 			'log',
 			...parser.arguments,
 			'-n1',
@@ -204,7 +251,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 		const getCore = async (cacheable?: CacheController) => {
 			try {
 				// Use for-each-ref with %(HEAD) to mark current branch with *
-				const result = await this.git.exec(
+				const result = await this.git.run(
 					{ cwd: repoPath, cancellation: cancellation, errors: 'ignore' },
 					'for-each-ref',
 					'--contains',
@@ -255,8 +302,9 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 					}
 				}
 
-				// Sort to move tags to the end, preserving order within each type
-				refs.sort((a, b) => (a.refType !== b.refType ? (a.refType === 'tag' ? 1 : -1) : 0));
+				// git already returns sorted by -HEAD, -committerdate, -version:refname;
+				// compareReachableRefs refines by current-first / local-before-remote / tag-version.
+				refs.sort(compareReachableRefs);
 
 				return { refs: refs };
 			} catch (ex) {
@@ -305,7 +353,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 		}
 
 		try {
-			const result = await this.git.exec(
+			const result = await this.git.run(
 				{ cwd: repoPath, cancellation: cancellation, configs: gitConfigsLog },
 				'log',
 				...args,
@@ -363,7 +411,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 		// Initial commit SHA is shared across all worktrees
 		return this.cache.getInitialCommitSha(repoPath, async commonPath => {
 			try {
-				const result = await this.git.exec(
+				const result = await this.git.run(
 					{ cwd: commonPath, cancellation: cancellation, errors: 'ignore' },
 					'rev-list',
 					`--max-parents=0`,
@@ -395,7 +443,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 			: [];
 
 		const run = async (): Promise<LeftRightCommitCountResult | undefined> => {
-			const result = await this.git.exec(
+			const result = await this.git.run(
 				{ cwd: repoPath, cancellation: cancellation, errors: 'ignore' },
 				'rev-list',
 				'--left-right',
@@ -585,10 +633,15 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 				cancellation: cancellation,
 				configs: gitConfigsLogWithFiles,
 				stdin: stdin,
+				// Single-commit log is cheap (typically <50ms) and almost always serves a user-
+				// initiated read (commit details, hover, etc.). Override the inferred 'background'
+				// priority so it doesn't queue behind heavier graph/log work — without this, a click
+				// on a commit while the graph is still loading can wait seconds for files to appear.
+				...(isSingleCommit ? { priority: 'normal' as const } : undefined),
 			};
 			let { commits, count, countStashChildCommits } = await parseCommits(
 				parser,
-				isSingleCommit ? this.git.exec(cmdOpts, ...args) : this.git.stream(cmdOpts, ...args),
+				isSingleCommit ? this.git.run(cmdOpts, ...args) : this.git.stream(cmdOpts, ...args),
 				repoPath,
 				pathspec,
 				limit,
@@ -616,7 +669,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 
 					({ commits, count, countStashChildCommits } = await parseCommits(
 						parser,
-						isSingleCommit ? this.git.exec(cmdOpts, ...args) : this.git.stream(cmdOpts, ...args),
+						isSingleCommit ? this.git.run(cmdOpts, ...args) : this.git.stream(cmdOpts, ...args),
 						repoPath,
 						pathspec,
 						limit,
@@ -1058,7 +1111,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 					args.push(pathspec);
 				}
 
-				const result = await this.git.exec(
+				const result = await this.git.run(
 					{ cwd: repoPath, cancellation: cancellation, configs: gitConfigsLog },
 					'log',
 					...args,
@@ -1100,7 +1153,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 
 			const parser = getShaLogParser();
 
-			const result = await this.git.exec(
+			const result = await this.git.run(
 				{ cwd: repoPath, cancellation: cancellation, configs: gitConfigsLog },
 				'log',
 				...parser.arguments,
@@ -1131,7 +1184,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 	async isAncestorOf(repoPath: string, rev1: string, rev2: string, cancellation?: AbortSignal): Promise<boolean> {
 		if (repoPath == null) return false;
 
-		const result = await this.git.exec(
+		const result = await this.git.run(
 			{ cwd: repoPath, cancellation: cancellation, errors: 'ignore' },
 			'merge-base',
 			'--is-ancestor',
@@ -1310,7 +1363,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 		const scope = getScopedLogger();
 
 		try {
-			const result = await this.git.exec(
+			const result = await this.git.run(
 				{
 					cwd: repoPath,
 					errors: 'ignore',
@@ -1337,7 +1390,7 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 		const scope = getScopedLogger();
 
 		try {
-			const result = await this.git.exec(
+			const result = await this.git.run(
 				{
 					cwd: repoPath,
 					errors: 'ignore',

package/src/git-cli/providers/config.ts

@@ -99,7 +99,7 @@ export class ConfigGitSubProvider implements GitConfigSubProvider {
 		}
 		args.push(key);
 
-		const result = await this.git.exec(
+		const result = await this.git.run(
 			{ cwd: repoPath ?? '', errors: 'ignore', runLocally: options?.runGitLocally },
 			...args,
 		);
@@ -131,7 +131,7 @@ export class ConfigGitSubProvider implements GitConfigSubProvider {
 		}
 		args.push(pattern);
 
-		const result = await this.git.exec(
+		const result = await this.git.run(
 			{ cwd: repoPath ?? '', errors: 'ignore', runLocally: options?.runGitLocally },
 			...args,
 		);
@@ -169,7 +169,7 @@ export class ConfigGitSubProvider implements GitConfigSubProvider {
 			args.push(key, value);
 		}
 
-		await this.git.exec({ cwd: repoPath ?? '', runLocally: true }, ...args);
+		await this.git.run({ cwd: repoPath ?? '', runLocally: true }, ...args);
 
 		// Only invalidate cache when not using a custom file (custom files aren't cached)
 		if (!options?.file) {
@@ -218,7 +218,7 @@ export class ConfigGitSubProvider implements GitConfigSubProvider {
 
 			const author = `${user.name} <${user.email}>`;
 			// Check if there is a mailmap for the current user
-			const result = await this.git.exec({ cwd: repoPath, errors: 'ignore' }, 'check-mailmap', author);
+			const result = await this.git.run({ cwd: repoPath, errors: 'ignore' }, 'check-mailmap', author);
 
 			if (result.stdout && result.stdout !== author) {
 				const match = mappedAuthorRegex.exec(result.stdout);
@@ -475,7 +475,7 @@ export class ConfigGitSubProvider implements GitConfigSubProvider {
 		if (this.context.workspace?.isTrusted === false) {
 			try {
 				await fs.stat(joinPaths(cwd, 'HEAD'));
-				result = await this.git.exec(
+				result = await this.git.run(
 					{ cwd: cwd, errors: 'throw', configs: ['-C', cwd] },
 					'rev-parse',
 					'--show-cdup',
@@ -490,7 +490,7 @@ export class ConfigGitSubProvider implements GitConfigSubProvider {
 		}
 
 		try {
-			result = await this.git.exec(
+			result = await this.git.run(
 				{ cwd: cwd, errors: 'throw' },
 				'rev-parse',
 				'--show-toplevel',
@@ -551,7 +551,7 @@ export class ConfigGitSubProvider implements GitConfigSubProvider {
 
 			const inDotGit = /this operation must be run in a work tree/.test(ex.stderr);
 			if (inDotGit && this.context.workspace?.isTrusted !== false) {
-				result = await this.git.exec({ cwd: cwd, errors: 'ignore' }, 'rev-parse', '--is-bare-repository');
+				result = await this.git.run({ cwd: cwd, errors: 'ignore' }, 'rev-parse', '--is-bare-repository');
 				if (result.stdout.trim() === 'true') {
 					const result = await this.revParseGitDir(cwd);
 					const repoPath = result?.commonPath ?? result?.path;
@@ -578,12 +578,7 @@ export class ConfigGitSubProvider implements GitConfigSubProvider {
 	}
 
 	private async revParseGitDir(cwd: string): Promise<{ path: string; commonPath?: string } | undefined> {
-		const result = await this.git.exec(
-			{ cwd: cwd, errors: 'ignore' },
-			'rev-parse',
-			'--git-dir',
-			'--git-common-dir',
-		);
+		const result = await this.git.run({ cwd: cwd, errors: 'ignore' }, 'rev-parse', '--git-dir', '--git-common-dir');
 		if (!result.stdout) return undefined;
 
 		let [dotGitPath, commonDotGitPath] = result.stdout.split('\n').map(r => r.trimStart());
@@ -704,7 +699,7 @@ export class ConfigGitSubProvider implements GitConfigSubProvider {
 		// Remove legacy keys from regular git config (use --unset-all defensively)
 		for (const [key] of migrateConfig) {
 			try {
-				await this.git.exec(
+				await this.git.run(
 					{ cwd: repoPath, errors: 'ignore', runLocally: true },
 					'config',
 					'--local',

package/src/git-cli/providers/contributors.ts

@@ -260,7 +260,7 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 				}
 
 				const currentUserPromise = this.provider.config.getCurrentUser(repoPath).catch(() => undefined);
-				const result = await this.git.exec({ cwd: repoPath, cancellation: signal }, ...args);
+				const result = await this.git.run({ cwd: repoPath, cancellation: signal }, ...args);
 				if (!result.stdout) return [];
 
 				const shortlog = parseShortlog(result.stdout, commonPath, await currentUserPromise);
@@ -301,7 +301,7 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 
 		const scope = getScopedLogger();
 
-		const getCore = async (commonPath: string): Promise<GitContributorsStats | undefined> => {
+		const getCore = async (commonPath: string, signal?: AbortSignal): Promise<GitContributorsStats | undefined> => {
 			try {
 				const args = ['shortlog', '-s', '--all'];
 
@@ -316,10 +316,7 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 					args.push(`--since=${options.since}`);
 				}
 
-				const result = await this.git.exec(
-					{ cwd: commonPath, cancellation: cancellation, timeout: timeout },
-					...args,
-				);
+				const result = await this.git.run({ cwd: commonPath, cancellation: signal, timeout: timeout }, ...args);
 				if (!result.stdout) return undefined;
 
 				const contributions = result.stdout
@@ -351,11 +348,9 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 			customCacheTTL = timeout * 2;
 		}
 
-		return this.cache.getContributorsStats(
-			repoPath,
-			cacheKey,
-			getCore,
-			customCacheTTL ? { accessTTL: customCacheTTL } : undefined,
-		);
+		return this.cache.getContributorsStats(repoPath, cacheKey, getCore, {
+			accessTTL: customCacheTTL,
+			cancellation: cancellation,
+		});
 	}
 }

package/src/git-cli/providers/diff.ts

@@ -60,7 +60,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		repoPath: string,
 		to?: string,
 		from?: string,
-		options?: { uris?: (string | Uri)[] },
+		options?: { uris?: (string | Uri)[]; includeUntracked?: boolean },
 		_cancellation?: AbortSignal,
 	): Promise<GitDiffShortStat | undefined> {
 		const scope = getScopedLogger();
@@ -76,7 +76,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		}
 
 		try {
-			const result = await this.git.exec(
+			const result = await this.git.run(
 				{ cwd: repoPath, configs: gitConfigsDiff },
 				'diff',
 				'--shortstat',
@@ -85,9 +85,24 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 				'--',
 				...(options?.uris?.map(p => this.provider.getRelativePath(p, repoPath)) ?? []),
 			);
-			if (!result.stdout) return undefined;
 
-			return parseGitDiffShortStat(result.stdout);
+			const stat = result.stdout ? parseGitDiffShortStat(result.stdout) : undefined;
+
+			// Merge in untracked files when the comparison involves the working tree.
+			// Skip when a pathspec filter is active — mixing a path-filtered diff count with an
+			// unfiltered untracked count would silently produce wrong totals.
+			if (options?.includeUntracked && !options.uris?.length && isWorkingTreeComparison(to, from)) {
+				const untracked = (await this.provider.status?.getUntrackedFiles?.(repoPath)) ?? [];
+				if (untracked.length) {
+					return {
+						files: (stat?.files ?? 0) + untracked.length,
+						additions: stat?.additions ?? 0,
+						deletions: stat?.deletions ?? 0,
+					};
+				}
+			}
+
+			return stat;
 		} catch (ex) {
 			const msg: string = ex?.toString() ?? '';
 			if (GitErrors.noMergeBase.test(msg)) {
@@ -134,7 +149,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 
 		let result;
 		try {
-			result = await this.git.exec(
+			result = await this.git.run(
 				{ cwd: repoPath, configs: gitConfigsDiff, errors: 'throw', env: options?.index?.env },
 				'diff',
 				...args,
@@ -173,7 +188,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		contents: string,
 		_cancellation?: AbortSignal,
 	): Promise<GitDiffFiles | undefined> {
-		const result = await this.git.exec(
+		const result = await this.git.run(
 			{ cwd: repoPath, configs: gitConfigsLog, stdin: contents },
 			'apply',
 			'--numstat',
@@ -194,7 +209,13 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		repoPath: string,
 		ref1OrRange: string | GitRevisionRange,
 		ref2?: string,
-		options?: { filters?: GitDiffFilter[]; path?: string; renameLimit?: number; similarityThreshold?: number },
+		options?: {
+			filters?: GitDiffFilter[];
+			includeUntracked?: boolean;
+			path?: string;
+			renameLimit?: number;
+			similarityThreshold?: number;
+		},
 	): Promise<GitFile[] | undefined> {
 		try {
 			const similarityThreshold = options?.similarityThreshold;
@@ -202,7 +223,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 				options?.renameLimit != null
 					? [...gitConfigsDiff, '-c', `diff.renameLimit=${options.renameLimit}`]
 					: gitConfigsDiff;
-			const result = await this.git.exec(
+			const result = await this.git.run(
 				{ cwd: repoPath, configs: configs },
 				'diff',
 				'--numstat',
@@ -216,9 +237,33 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 				'--',
 				options?.path ? options.path : undefined,
 			);
-			if (!result.stdout) return undefined;
 
-			return parseGitDiffNumStatFiles(result.stdout, repoPath);
+			const files = result.stdout ? (parseGitDiffNumStatFiles(result.stdout, repoPath) ?? []) : [];
+
+			// Merge in untracked files when the comparison involves the working tree.
+			// Skip when `filters` excludes additions (untracked entries are semantically 'A'/added),
+			// or when `path` is a non-exact pathspec we can't reliably match against the untracked list.
+			if (
+				options?.includeUntracked &&
+				ref2 == null &&
+				typeof ref1OrRange === 'string' &&
+				!isRevisionRange(ref1OrRange) &&
+				!isUncommittedStaged(ref1OrRange) &&
+				filtersAllowUntracked(options.filters) &&
+				!isNonExactPathspec(options.path)
+			) {
+				const untracked = (await this.provider.status?.getUntrackedFiles?.(repoPath)) ?? [];
+				if (untracked.length) {
+					const seen = new Set(files.map(f => f.path));
+					for (const file of untracked) {
+						if (seen.has(file.path)) continue;
+						if (options.path && options.path !== file.path) continue;
+						files.push(file);
+					}
+				}
+			}
+
+			return files.length ? files : undefined;
 		} catch (_ex) {
 			return undefined;
 		}
@@ -283,7 +328,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 			// Follow file history and specify the file path
 			args.push('--follow', '--', relativePath);
 
-			const result = await this.git.exec({ cwd: repoPath, configs: gitConfigsLog }, ...args);
+			const result = await this.git.run({ cwd: repoPath, configs: gitConfigsLog }, ...args);
 
 			let currentSha;
 			let currentPath;
@@ -511,7 +556,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 
 			args.push('--follow', rev!, '--', relativePath);
 
-			const result = await this.git.exec(
+			const result = await this.git.run(
 				{
 					cwd: repoPath,
 					configs: gitConfigsLog,
@@ -636,7 +681,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 
 			let result: GitResult;
 			try {
-				result = await this.git.exec({ cwd: repoPath, configs: gitConfigsLog }, ...args);
+				result = await this.git.run({ cwd: repoPath, configs: gitConfigsLog }, ...args);
 			} catch (ex) {
 				if (rev && !isUncommittedStaged(rev)) throw ex;
 
@@ -659,7 +704,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 				};
 
 				args.splice(index, 1, `-L${range.startLine},${range.endLine}:${relativePath}`);
-				result = await this.git.exec({ cwd: repoPath, configs: gitConfigsLog }, ...args);
+				result = await this.git.run({ cwd: repoPath, configs: gitConfigsLog }, ...args);
 			}
 
 			let currentRange;
@@ -761,7 +806,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		}
 
 		try {
-			return await this.git.exec(
+			return await this.git.run(
 				{ cwd: repoPath, configs: gitConfigsDiff, encoding: options?.encoding },
 				...params,
 				'--',
@@ -805,7 +850,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		params.push('--no-index');
 
 		try {
-			const result = await this.git.exec(
+			const result = await this.git.run(
 				{
 					cwd: repoPath,
 					configs: gitConfigsDiff,
@@ -939,7 +984,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 				scope?.debug(`Using tool=${tool}`);
 			}
 
-			await this.git.exec(
+			await this.git.run(
 				{ cwd: root },
 				'difftool',
 				'--no-prompt',
@@ -978,7 +1023,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 				scope?.debug(`Using tool=${tool}`);
 			}
 
-			await this.git.exec({ cwd: repoPath }, 'difftool', '--dir-diff', `--tool=${tool}`, ref1, ref2);
+			await this.git.run({ cwd: repoPath }, 'difftool', '--dir-diff', `--tool=${tool}`, ref1, ref2);
 		} catch (ex) {
 			const msg: string = ex?.toString() ?? '';
 			if (msg === 'No diff tool found' || /Unknown .+? tool/.test(msg)) {
@@ -993,6 +1038,42 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		}
 	}
 }
+// Returns true when no --diff-filter is active or when it includes additions ('A' or '*').
+// Untracked files are semantically "added" — if a caller restricts filters to e.g. ['M'],
+// honor that and omit untracked.
+function filtersAllowUntracked(filters: GitDiffFilter[] | undefined): boolean {
+	if (!filters?.length) return true;
+	return filters.includes('A') || filters.includes('*');
+}
+
+// Returns true when the path is a git pathspec we can't match with simple equality
+// (directory prefix, glob, or magic pathspec). In that case, skip the untracked merge
+// rather than risk excluding legitimate matches or including wrong ones.
+function isNonExactPathspec(path: string | undefined): boolean {
+	if (!path) return false;
+	return path.endsWith('/') || /[*?[\]]|^:/.test(path);
+}
+
+// Returns true when the `git diff` invocation shape includes the working tree
+// (i.e. `git diff`, `git diff HEAD`, or `git diff <ref>` with no `from`), and
+// therefore untracked files are a meaningful addition to the result.
+function isWorkingTreeComparison(to: string | undefined, from: string | undefined): boolean {
+	if (to == null) return true;
+	if (isRevisionRange(to) || isUncommittedStaged(to)) return false;
+
+	// `to === uncommitted` always targets the working tree (`prepareToFromDiffArgs` sets
+	// `from = 'HEAD'` when omitted, or diffs against the caller-supplied `from`).
+	if (isUncommitted(to)) return true;
+
+	// `git diff <from>` — `to === ''` means the caller explicitly asked for working tree vs `from`
+	if (to === '') return from == null || !isUncommittedStaged(from);
+
+	// `getChangedFilesCount` uses `prepareToFromDiffArgs`, which translates `to` (with no `from`)
+	// to `${to}^ ${to}` UNLESS `to` is HEAD or empty.
+	if (to.toUpperCase() === 'HEAD' && from == null) return true;
+	return false;
+}
+
 function prepareToFromDiffArgs(
 	to: string,
 	from: string | undefined,
@@ -1063,7 +1144,7 @@ export async function findPathStatusChanged(
 
 	const ordering = options?.ordering;
 
-	const result = await git.exec(
+	const result = await git.run(
 		{ cwd: repoPath, configs: gitConfigsLog },
 		'log',
 		...parser.arguments,