From 4d691fdc236006d6123560570af3e949a3b2c06e Mon Sep 17 00:00:00 2001
From: TJ DeVries <devries.timothyj@gmail.com>
Date: Wed, 1 Sep 2021 07:15:37 -0700
Subject: [PATCH] fix: Should not block on git commands (#1176)

---
 lua/telescope/builtin/git.lua | 70 ++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/lua/telescope/builtin/git.lua b/lua/telescope/builtin/git.lua
index 99f1b4b..6fa855f 100644
--- a/lua/telescope/builtin/git.lua
+++ b/lua/telescope/builtin/git.lua
@@ -43,21 +43,22 @@ git.files = function(opts)
 end
 
 git.commits = function(opts)
-  local results = utils.get_os_command_output({
-    "git",
-    "log",
-    "--pretty=oneline",
-    "--abbrev-commit",
-    "--",
-    ".",
-  }, opts.cwd)
+  opts.entry_maker = opts.entry_maker or make_entry.gen_from_git_commits(opts)
 
   pickers.new(opts, {
     prompt_title = "Git Commits",
-    finder = finders.new_table {
-      results = results,
-      entry_maker = opts.entry_maker or make_entry.gen_from_git_commits(opts),
-    },
+
+    finder = finders.new_oneshot_job(
+      vim.tbl_flatten {
+        "git",
+        "log",
+        "--pretty=oneline",
+        "--abbrev-commit",
+        "--",
+        ".",
+      },
+      opts
+    ),
     previewer = {
       previewers.git_commit_diff_to_parent.new(opts),
       previewers.git_commit_diff_to_head.new(opts),
@@ -79,19 +80,21 @@ git.commits = function(opts)
 end
 
 git.stash = function(opts)
-  local results = utils.get_os_command_output({
-    "git",
-    "--no-pager",
-    "stash",
-    "list",
-  }, opts.cwd)
+  opts.entry_maker = opts.entry_maker or make_entry.gen_from_git_stash()
 
   pickers.new(opts, {
     prompt_title = "Git Stash",
-    finder = finders.new_table {
-      results = results,
-      entry_maker = opts.entry_maker or make_entry.gen_from_git_stash(),
-    },
+    finder = finders.new_oneshot_job(
+      vim.tbl_flatten {
+        "git",
+        "log",
+        "--pretty=oneline",
+        "--abbrev-commit",
+        "--",
+        ".",
+      },
+      opts
+    ),
     previewer = previewers.git_stash_diff.new(opts),
     sorter = conf.file_sorter(opts),
     attach_mappings = function()
@@ -109,20 +112,21 @@ end
 git.bcommits = function(opts)
   opts.current_line = not opts.current_file and get_current_buf_line(0) or nil
   opts.current_file = opts.current_file or vim.fn.expand "%:p"
-  local results = utils.get_os_command_output({
-    "git",
-    "log",
-    "--pretty=oneline",
-    "--abbrev-commit",
-    opts.current_file,
-  }, opts.cwd)
+
+  opts.entry_maker = opts.entry_maker or make_entry.gen_from_git_commits(opts)
 
   pickers.new(opts, {
     prompt_title = "Git BCommits",
-    finder = finders.new_table {
-      results = results,
-      entry_maker = opts.entry_maker or make_entry.gen_from_git_commits(opts),
-    },
+    finder = finders.new_oneshot_job(
+      vim.tbl_flatten {
+        "git",
+        "log",
+        "--pretty=oneline",
+        "--abbrev-commit",
+        opts.current_file,
+      },
+      opts
+    ),
     previewer = {
       previewers.git_commit_diff_to_parent.new(opts),
       previewers.git_commit_diff_to_head.new(opts),