diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ac606bc0e..1f3010b30 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -99,9 +99,11 @@ See [the test documentation for more details](./tests/README.md). ### Linting Additionally, linting is enforced using `selene` to catch common errors, most of which are also caught by -`lua-language-server`. +`lua-language-server`. Source code spell checking is done via `typos`. -```sh make lint ``` +```sh +make lint +``` ### Formatting diff --git a/lua/neogit/lib/git/branch.lua b/lua/neogit/lib/git/branch.lua index a5e472377..8eb80efa3 100644 --- a/lua/neogit/lib/git/branch.lua +++ b/lua/neogit/lib/git/branch.lua @@ -424,7 +424,7 @@ local function update_branch_information(state) local pushRemote = git.branch.pushRemote_ref() if pushRemote and not status.detached then - local remote, branch = unpack(vim.split(pushRemote, "/")) + local remote, branch = pushRemote:match("([^/]+)/(.+)") state.pushRemote.ref = pushRemote state.pushRemote.remote = remote state.pushRemote.branch = branch diff --git a/lua/neogit/lib/graph/kitty.lua b/lua/neogit/lib/graph/kitty.lua index fa5ab6ca6..4936abcc2 100644 --- a/lua/neogit/lib/graph/kitty.lua +++ b/lua/neogit/lib/graph/kitty.lua @@ -670,10 +670,10 @@ function M.build(commits, color) local connector_row = { cells = connector_cells } ---@type I.Row -- handle bi-connector rows - local is_bi_crossing, bi_crossing_safely_resolveable = + local is_bi_crossing, bi_crossing_safely_resolvable = get_is_bi_crossing(commit_row, connector_row, next_commit) - if is_bi_crossing and bi_crossing_safely_resolveable and next_commit then + if is_bi_crossing and bi_crossing_safely_resolvable and next_commit then resolve_bi_crossing(prev_commit_row, prev_connector_row, commit_row, connector_row, next_commit) end