Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(compiler): broken .git dir path resolution #269

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix(compiler): broken .git dir path resolution #269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec07bf9
fix(compiler): broken `.git` dir path resolution
tmillr May 29, 2023
2a70216
Merge branch 'main' into fix-gitpath-retrieval
ful1e5 Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 64 additions & 5 deletions lua/github-theme/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
local uv = vim.loop
local config = require('github-theme.config')

local function read_file(filepath)
Expand All @@ -17,6 +18,16 @@ local function write_file(filepath, content)
end
end

local function stat_file(path)
for _ = 1, 3 do
local stat = uv.fs_stat(path)
if stat then
return stat
end
uv.sleep(1)
end
end

local M = {}

function M.reset()
Expand Down Expand Up @@ -94,12 +105,60 @@ M.setup = function(opts)
local cached_path = util.join_paths(config.options.compile_path, 'cache')
local cached = read_file(cached_path)

local git_path =
vim.fn.fnamemodify(vim.fn.resolve(debug.getinfo(1).source:sub(2)), ':p:h:h:h')
local git = vim.fn.getftime(util.join_paths(git_path, '.git'))
local hash = require('github-theme.lib.hash')(opts) .. (git == -1 and git_path or git)
local git_mtime
local git_path = debug.getinfo(1).source

if (git_path or ''):find('^@.') then
git_path = git_path:sub(2) .. '/../../../.git'
local st = stat_file(git_path)

if not st then
goto skip
end

-- Handle a .git "file" (e.g. worktree or submodule)
if st.type == 'file' then
local f = io.open(git_path, 'r')

if not f then
goto skip
end

local gitdir_path = (f:read('*l') or ''):match('^gitdir: (.+)')
f:close()

if not gitdir_path then
goto skip
end

git_path = gitdir_path
st = stat_file(git_path)

if not st then
goto skip
end
end

local sec, nsec = st.mtime.sec, st.mtime.nsec or 0

if nsec == 1e9 then
sec = sec + 1
nsec = 0
end

git_mtime = ('%d.%09d'):format(sec, nsec)
end

::skip::

local hash = ('%s %s'):format(
require('github-theme.lib.hash')(opts),
git_mtime or git_path
)

if cached ~= hash then
-- Force re-compile if .git dir could not be detected (plugin may have been
-- updated and we don't want to use a stale cache).
if cached ~= hash or not git_mtime then
M.compile()
write_file(cached_path, hash)
end
Expand Down