tweak uncommitted changes message

Author: letmaik

src/gitHelper.ts

@@ -237,8 +237,13 @@ export async function diffIndex(repo: Repository, ref: string, refreshIndex: boo
     return statuses;
 }
 
-export async function hasUncommittedChanges(repo: Repository, path: string): Promise<boolean> {
-    const result = await repo.exec(['status', '-z', path]);
+export async function hasUncommittedChanges(repo: Repository, path: string, ignoreUntracked: boolean = false): Promise<boolean> {
+    const args = ['status', '-z'];
+    if (ignoreUntracked) {
+        args.push('-uno');
+    }
+    args.push(path);
+    const result = await repo.exec(args);
     return result.stdout.trim() !== '';
 }
 

src/treeProvider.ts

@@ -1183,18 +1183,14 @@ export class GitTreeCompareProvider implements TreeDataProvider<Element>, Dispos
 
         const repository = this.repository;
 
-        // Check for uncommitted changes
+        // Check for uncommitted changes (ignoring untracked files)
         try {
-            if (await hasUncommittedChanges(repository, repository.root)) {
-                const proceed = await window.showWarningMessage(
-                    'You have uncommitted changes. Checking out the PR will discard them. Continue?',
-                    { modal: true },
-                    'Continue',
-                    'Cancel'
+            if (await hasUncommittedChanges(repository, repository.root, true)) {
+                window.showErrorMessage(
+                    'Please commit your changes or stash them before continuing.',
+                    { modal: true }
                 );
-                if (proceed !== 'Continue') {
                     return;
-                }
             }
         } catch (e: any) {
             this.log('Error checking for uncommitted changes', e);