From 57e454b4811a206772bd8c35e0173cdca2215452 Mon Sep 17 00:00:00 2001
From: Sarmishta Velury <isc-svelury@users.noreply.github.com>
Date: Thu, 21 Apr 2022 14:25:28 -0400
Subject: [PATCH] Fix edge case where stash confirmation did not work as
 expected when all changes were made by a different user

---
 git-webui/release/share/git-webui/webui/js/git-webui.js | 9 +++++----
 git-webui/src/share/git-webui/webui/js/git-webui.js     | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 1ccba08f..cbdbc9bd 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2238,7 +2238,9 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
             }
             removeUnavailableModal(popup);
             if(action == 'discard'){
-                self.cancel()
+                self.cancel();
+            } else if(action == 'stash'){
+                self.stash();
             }
             else{
                 self.process();
@@ -2345,18 +2347,17 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
 
         if(combinedFiles.length>0)
             confirmActionForUnavailableFile(combinedFiles, action);
-            workspaceView.update("stash");
-
     }
 
     self.stash = function() {
         var files = self.getFileList(undefined, "D", 0, 1);
         var rmFiles = self.getFileList("D", undefined, 0, 1);
-        var combinedFiles = files+" "+rmFiles;
+        var combinedFiles = files.concat(rmFiles);
 
         if(combinedFiles.length != 0){
             webui.git("stash push -- " + combinedFiles, function(output){
                 webui.showSuccess(output);
+                workspaceView.update("stash");
             });
         }
     }
diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js
index 1ccba08f..cbdbc9bd 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -2238,7 +2238,9 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
             }
             removeUnavailableModal(popup);
             if(action == 'discard'){
-                self.cancel()
+                self.cancel();
+            } else if(action == 'stash'){
+                self.stash();
             }
             else{
                 self.process();
@@ -2345,18 +2347,17 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
 
         if(combinedFiles.length>0)
             confirmActionForUnavailableFile(combinedFiles, action);
-            workspaceView.update("stash");
-
     }
 
     self.stash = function() {
         var files = self.getFileList(undefined, "D", 0, 1);
         var rmFiles = self.getFileList("D", undefined, 0, 1);
-        var combinedFiles = files+" "+rmFiles;
+        var combinedFiles = files.concat(rmFiles);
 
         if(combinedFiles.length != 0){
             webui.git("stash push -- " + combinedFiles, function(output){
                 webui.showSuccess(output);
+                workspaceView.update("stash");
             });
         }
     }