From 12f8798bb05038a6269c6e50fe20c53ac47f75e3 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Sun, 26 Jun 2022 13:53:44 +0200
Subject: fix(installer): always use check shallow clones (#2763)

---
 lua/lvim/utils/git.lua | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lua/lvim/utils/git.lua')

diff --git a/lua/lvim/utils/git.lua b/lua/lvim/utils/git.lua
index 81b1faf4..62915458 100644
--- a/lua/lvim/utils/git.lua
+++ b/lua/lvim/utils/git.lua
@@ -32,20 +32,20 @@ local function git_cmd(opts)
     Log:debug(stdout)
   end
 
-  return ret, stdout
+  return ret, stdout, stderr
 end
 
 local function safe_deep_fetch()
-  local ret, result = git_cmd { args = { "rev-parse", "--is-shallow-repository" } }
+  local ret, result, error = git_cmd { args = { "rev-parse", "--is-shallow-repository" } }
   if ret ~= 0 then
-    Log:error "Git fetch failed! Check the log for further information"
+    Log:error(vim.inspect(error))
     return
   end
   -- git fetch --unshallow will cause an error on a a complete clone
   local fetch_mode = result[1] == "true" and "--unshallow" or "--all"
   ret = git_cmd { args = { "fetch", fetch_mode } }
   if ret ~= 0 then
-    Log:error "Git fetch failed! Check the log for further information"
+    Log:error("Git fetch failed! Please pull the changes manually in " .. get_lvim_base_dir())
     return
   end
   return true
@@ -55,12 +55,12 @@ end
 function M.update_base_lvim()
   Log:info "Checking for updates"
 
-  local ret = git_cmd { args = { "fetch" } }
-  if ret ~= 0 then
-    Log:error "Update failed! Check the log for further information"
+  if not safe_deep_fetch() then
     return
   end
 
+  local ret
+
   ret = git_cmd { args = { "diff", "--quiet", "@{upstream}" } }
   if ret == 0 then
     Log:info "LunarVim is already up-to-date"
@@ -69,7 +69,7 @@ function M.update_base_lvim()
 
   ret = git_cmd { args = { "merge", "--ff-only", "--progress" } }
   if ret ~= 0 then
-    Log:error "Update failed! Please pull the changes manually instead."
+    Log:error("Update failed! Please pull the changes manually in " .. get_lvim_base_dir())
     return
   end
 
-- 
cgit v1.2.3