fix: all git builtin respect cwd now (#517)

This commit is contained in:
Simon Hauser
2021-02-09 18:25:57 +01:00
committed by GitHub
parent 993e383dd5
commit 3a7fa41857
7 changed files with 41 additions and 37 deletions

View File

@@ -927,12 +927,12 @@ function make_entry.gen_from_autocommands(_)
end
end
function make_entry.gen_from_git_status(_)
function make_entry.gen_from_git_status(opts)
local displayer = entry_display.create {
separator = " ",
items = {
{ width = 1},
{ width = 1},
{ width = 1 },
{ width = 1 },
{ remaining = true },
}
}
@@ -947,8 +947,8 @@ function make_entry.gen_from_git_status(_)
end
return displayer {
{ string.sub(entry.status, 1, 1), staged},
{ string.sub(entry.status, -1), modified},
{ string.sub(entry.status, 1, 1), staged },
{ string.sub(entry.status, -1), modified },
entry.value,
}
end
@@ -956,12 +956,14 @@ function make_entry.gen_from_git_status(_)
return function (entry)
if entry == '' then return nil end
local mod, file = string.match(entry, '(..).*%s[->%s]?(.+)')
return {
value = file,
status = mod,
ordinal = entry,
display = make_display,
}
return {
value = file,
status = mod,
ordinal = entry,
display = make_display,
path = opts.cwd .. path.separator .. file
}
end
end