git4idea: Show message box if autounstash fails

2026-09-27 10:03:11 +07:00 · 2009-10-06 18:30:15 +04:00
parent 3ff3b4f12a
commit 11dd0242bf
1 changed files with 12 additions and 1 deletions
@@ -47,6 +47,7 @@ import git4idea.commands.GitLineHandlerAdapter;
 import git4idea.config.GitVcsSettings;
 import git4idea.i18n.GitBundle;
 import git4idea.merge.MergeChangeCollector;
+import git4idea.ui.GitUIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -230,7 +231,17 @@ public class GitUpdateEnvironment implements UpdateEnvironment {
            }
            finally {
              if (stashCreated) {
-                GitStashUtils.popLastStash(myProject, root);
+                try {
+                  GitStashUtils.popLastStash(myProject, root);
+                }
+                catch (final VcsException ue) {
+                  exceptions.add(ue);
+                  UIUtil.invokeAndWaitIfNeeded(new Runnable() {
+                    public void run() {
+                      GitUIUtil.showOperationError(myProject, ue, "Auto-unstash");
+                    }
+                  });
+                }
              }
            }
          }