Check for value in stderr callback

lewis6991 · Mar 1, 2021 · cdf8e98 · cdf8e98
1 parent 9781324
commit cdf8e98
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/lua/gitsigns/git.lua b/lua/gitsigns/git.lua
@@ -216,11 +216,18 @@ function M.run_diff(staged, text, diff_algo)
                end
             end
          end,
-         on_stderr = function(_, line)
+         on_stderr = function(err, line)
+            if err then
+
+               vim.schedule(function()
+                  print('error: ' .. err, 'NA', 'run_diff')
+               end)
+            elseif line then
 
-            vim.schedule(function()
-               print('error: ' .. line, 'NA', 'run_diff')
-            end)
+               vim.schedule(function()
+                  print('error: ' .. line, 'NA', 'run_diff')
+               end)
+            end
          end,
          on_exit = function()
             callback(results)

diff --git a/teal/gitsigns/git.tl b/teal/gitsigns/git.tl
@@ -216,11 +216,18 @@ function M.run_diff(staged: string, text: {string}, diff_algo: string): cb_funct
           end
         end
       end,
-      on_stderr = function(_, line: string)
+      on_stderr = function(err: string, line: string)
+        if err then
+           -- On windows print() crashes in callback threads
+           vim.schedule(function()
+              print('error: ' .. err, 'NA', 'run_diff')
+           end)
+        elseif line then
            -- On windows print() crashes in callback threads
            vim.schedule(function()
               print('error: ' .. line, 'NA', 'run_diff')
            end)
+         end
       end,
       on_exit = function()
         callback(results)