Fixes failure to finish and commit when no workdir changes present

Author: axosoft-ramint

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

@@ -123,7 +123,7 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 	@log()
 	async hasWorkingChanges(
 		repoPath: string,
-		options?: { staged?: boolean; unstaged?: boolean; untracked?: boolean },
+		options?: { staged?: boolean; unstaged?: boolean; untracked?: boolean; throwOnError?: boolean },
 		cancellation?: CancellationToken,
 	): Promise<boolean> {
 		const scope = getLogScope();
@@ -169,6 +169,7 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 			// Log other errors and return false for graceful degradation
 			Logger.error(ex, scope);
 			setLogScopeExit(scope, ' \u2022 error checking for changes');
+			if (options?.throwOnError) throw ex;
 			return false;
 		}
 	}

src/git/gitProvider.ts

@@ -762,6 +762,8 @@ export interface GitStatusSubProvider {
 			unstaged?: boolean;
 			/** Check for untracked files (default: true) */
 			untracked?: boolean;
+			/** Throw errors rather than returning false */
+			throwOnError?: boolean;
 		},
 		cancellation?: CancellationToken,
 	): Promise<boolean>;

src/webviews/plus/composer/composerWebview.ts

@@ -1393,30 +1393,34 @@ export class ComposerWebviewProvider implements WebviewProvider<State, State, Co
 
 			// Capture previous stash state
 			let previousStashCommit;
-			let stash = await svc.stash?.getStash();
-			if (stash?.stashes.size) {
-				const latestStash = stash.stashes.values().next().value;
-				if (latestStash) {
-					previousStashCommit = latestStash;
-				}
-			}
-
-			// Stash the working changes
-			const stashMessage = `Commit composer: ${new Date().toLocaleString()}`;
-			await svc.stash?.saveStash(stashMessage, undefined, { includeUntracked: true });
-
-			// Get the new stash reference
-			stash = await svc.stash?.getStash();
+			let stash;
 			let stashCommit;
 			let stashedSuccessfully = false;
-			if (stash?.stashes.size) {
-				stashCommit = stash.stashes.values().next().value;
-				if (
-					stashCommit &&
-					stashCommit.ref !== previousStashCommit?.ref &&
-					stashCommit.message?.includes(stashMessage)
-				) {
-					stashedSuccessfully = true;
+			const hasWorkingChanges = await repo.git.status.hasWorkingChanges({ throwOnError: true });
+			if (hasWorkingChanges) {
+				stash = await svc.stash?.getStash();
+				if (stash?.stashes.size) {
+					const latestStash = stash.stashes.values().next().value;
+					if (latestStash) {
+						previousStashCommit = latestStash;
+					}
+				}
+
+				// Stash the working changes
+				const stashMessage = `Commit composer: ${new Date().toLocaleString()}`;
+				await svc.stash?.saveStash(stashMessage, undefined, { includeUntracked: true });
+
+				// Get the new stash reference
+				stash = await svc.stash?.getStash();
+				if (stash?.stashes.size) {
+					stashCommit = stash.stashes.values().next().value;
+					if (
+						stashCommit &&
+						stashCommit.ref !== previousStashCommit?.ref &&
+						stashCommit.message?.includes(stashMessage)
+					) {
+						stashedSuccessfully = true;
+					}
 				}
 			}