Terminal Removes includeUntracked from getDiff and intentToAdd from stageFiles

Closes #4364
Closes #4365

Author: axosoft-ramint

src/commands/patches.ts

@@ -167,10 +167,26 @@ abstract class CreatePatchCommandBase extends GlCommandBase {
 		repo ??= await getRepositoryOrShowPicker(this.container, title);
 		if (repo == null) return;
 
-		return repo.git.diff.getDiff?.(args?.to ?? uncommitted, args?.from ?? 'HEAD', {
-			includeUntracked: args?.includeUntracked ?? (args?.to != null || args?.to === uncommitted),
-			uris: args?.uris,
-		});
+		let untrackedPaths: string[] | undefined;
+		try {
+			if (args?.to === uncommitted) {
+				const status = await repo.git.status?.getStatus();
+
+				untrackedPaths = status?.untrackedChanges.map(f => f.path);
+
+				if (untrackedPaths?.length) {
+					await repo.git.staging?.stageFiles(untrackedPaths);
+				}
+			}
+
+			return await repo.git.diff.getDiff?.(args?.to ?? uncommitted, args?.from ?? 'HEAD', {
+				uris: args?.uris,
+			});
+		} finally {
+			if (untrackedPaths?.length) {
+				await repo.git.staging?.unstageFiles(untrackedPaths);
+			}
+		}
 	}
 
 	abstract override execute(args?: CreatePatchCommandArgs): Promise<void>;

src/env/node/git/sub-providers/diff.ts

@@ -94,7 +94,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		repoPath: string,
 		to: string,
 		from?: string,
-		options?: { context?: number; includeUntracked?: boolean; notation?: GitRevisionRangeNotation; uris?: Uri[] },
+		options?: { context?: number; notation?: GitRevisionRangeNotation; uris?: Uri[] },
 	): Promise<GitDiff | undefined> {
 		const scope = getLogScope();
 		const args = [`-U${options?.context ?? 3}`];
@@ -118,22 +118,6 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 			args.push('--', ...paths);
 		}
 
-		if (options?.includeUntracked && to === uncommitted) {
-			const status = await this.provider.status?.getStatus(repoPath);
-
-			untrackedPaths = status?.untrackedChanges.map(f => f.path);
-
-			if (untrackedPaths?.length) {
-				if (paths?.size) {
-					untrackedPaths = untrackedPaths.filter(p => paths.has(p));
-				}
-
-				if (untrackedPaths.length) {
-					await this.provider.staging?.stageFiles(repoPath, untrackedPaths, { intentToAdd: true });
-				}
-			}
-		}
-
 		let result;
 		try {
 			result = await this.git.exec(

src/env/node/git/sub-providers/staging.ts

@@ -67,41 +67,33 @@ export class StagingGitSubProvider implements GitStagingSubProvider {
 	}
 
 	@log()
-	async stageFile(repoPath: string, pathOrUri: string | Uri, options?: { intentToAdd?: boolean }): Promise<void> {
+	async stageFile(repoPath: string, pathOrUri: string | Uri): Promise<void> {
 		await this.git.exec(
 			{ cwd: repoPath },
 			'add',
-			options?.intentToAdd ? '-N' : '-A',
+			'-A',
 			'--',
 			typeof pathOrUri === 'string' ? pathOrUri : splitPath(pathOrUri, repoPath)[0],
 		);
 	}
 
 	@log()
-	async stageFiles(
-		repoPath: string,
-		pathOrUri: string[] | Uri[],
-		options?: { intentToAdd?: boolean },
-	): Promise<void> {
+	async stageFiles(repoPath: string, pathOrUri: string[] | Uri[]): Promise<void> {
 		await this.git.exec(
 			{ cwd: repoPath },
 			'add',
-			options?.intentToAdd ? '-N' : '-A',
+			'-A',
 			'--',
 			...pathOrUri.map(p => (typeof p === 'string' ? p : splitPath(p, repoPath)[0])),
 		);
 	}
 
 	@log()
-	async stageDirectory(
-		repoPath: string,
-		directoryOrUri: string | Uri,
-		options?: { intentToAdd?: boolean },
-	): Promise<void> {
+	async stageDirectory(repoPath: string, directoryOrUri: string | Uri): Promise<void> {
 		await this.git.exec(
 			{ cwd: repoPath },
 			'add',
-			options?.intentToAdd ? '-N' : '-A',
+			'-A',
 			'--',
 			typeof directoryOrUri === 'string' ? directoryOrUri : splitPath(directoryOrUri, repoPath)[0],
 		);

src/git/gitProvider.ts

@@ -447,7 +447,7 @@ export interface GitDiffSubProvider {
 		repoPath: string,
 		to: string,
 		from?: string,
-		options?: { context?: number; includeUntracked?: boolean; notation?: GitRevisionRangeNotation; uris?: Uri[] },
+		options?: { context?: number; notation?: GitRevisionRangeNotation; uris?: Uri[] },
 		cancellation?: CancellationToken,
 	): Promise<GitDiff | undefined>;
 	getDiffFiles?(
@@ -652,9 +652,9 @@ export interface DisposableTemporaryGitIndex extends UnifiedAsyncDisposable {
 
 export interface GitStagingSubProvider {
 	createTemporaryIndex(repoPath: string, base: string): Promise<DisposableTemporaryGitIndex>;
-	stageFile(repoPath: string, pathOrUri: string | Uri, options?: { intentToAdd?: boolean }): Promise<void>;
-	stageFiles(repoPath: string, pathOrUri: string[] | Uri[], options?: { intentToAdd?: boolean }): Promise<void>;
-	stageDirectory(repoPath: string, directoryOrUri: string | Uri, options?: { intentToAdd?: boolean }): Promise<void>;
+	stageFile(repoPath: string, pathOrUri: string | Uri): Promise<void>;
+	stageFiles(repoPath: string, pathOrUri: string[] | Uri[]): Promise<void>;
+	stageDirectory(repoPath: string, directoryOrUri: string | Uri): Promise<void>;
 	unstageFile(repoPath: string, pathOrUri: string | Uri): Promise<void>;
 	unstageFiles(repoPath: string, pathOrUri: string[] | Uri[]): Promise<void>;
 	unstageDirectory(repoPath: string, directoryOrUri: string | Uri): Promise<void>;