fix checking for git dir in a bare repo (#757)

* fix checking for git dir in a bare repo

* revert last change and look for worktree

* fix lint error

* [docgen] Update doc/telescope.txt
skip-checks: true

Co-authored-by: Brian Ryall <brian.ryall@udri.udayton.edu>
Co-authored-by: Github Actions <actions@github>
This commit is contained in:
PolarMutex
2021-04-22 13:23:42 -04:00
committed by GitHub
parent 3adeab2bed
commit 0d6cd47990
2 changed files with 52 additions and 17 deletions

View File

@@ -116,22 +116,6 @@ builtin.live_grep() *builtin.live_grep()*
Actions functions that are useful for people creating their own mappings.
actions.move_selection_next({prompt_bufnr}) *actions.move_selection_next()*
Move the selection to the next entry
Parameters: ~
{prompt_bufnr} (number) The prompt bufnr
actions.move_selection_previous({prompt_bufnr})*actions.move_selection_previous()*
Move the selection to the previous entry
Parameters: ~
{prompt_bufnr} (number) The prompt bufnr
actions.move_selection_worse({prompt_bufnr}) *actions.move_selection_worse()*
Move the selection to the entry that has a worse score
@@ -196,6 +180,54 @@ actions.toggle_selection({prompt_bufnr}) *actions.toggle_selection()*
{prompt_bufnr} (number) The prompt bufnr
actions.git_create_branch({prompt_bufnr}) *actions.git_create_branch()*
Create and checkout a new git branch if it doesn't already exist
Parameters: ~
{prompt_bufnr} (number) The prompt bufnr
actions.git_checkout({prompt_bufnr}) *actions.git_checkout()*
Checkout an existing git branch
Parameters: ~
{prompt_bufnr} (number) The prompt bufnr
actions.git_track_branch({prompt_bufnr}) *actions.git_track_branch()*
Tell git to track the currently selected remote branch in Telescope
Parameters: ~
{prompt_bufnr} (number) The prompt bufnr
actions.git_delete_branch({prompt_bufnr}) *actions.git_delete_branch()*
Delete the currently selected branch
Parameters: ~
{prompt_bufnr} (number) The prompt bufnr
actions.git_rebase_branch({prompt_bufnr}) *actions.git_rebase_branch()*
Rebase to selected git branch
Parameters: ~
{prompt_bufnr} (number) The prompt bufnr
actions.git_staging_toggle({prompt_bufnr}) *actions.git_staging_toggle()*
Stage/unstage selected file
Parameters: ~
{prompt_bufnr} (number) The prompt bufnr
actions.open_qflist() *actions.open_qflist()*
Open the quickfix list

View File

@@ -244,7 +244,10 @@ local set_opts_cwd = function(opts)
local use_git_root = utils.get_default(opts.use_git_root, true)
if ret ~= 0 then
error(opts.cwd .. ' is not a git directory')
local is_worktree = utils.get_os_command_output({ "git", "rev-parse", "--is-inside-work-tree" }, opts.cwd)
if is_worktree == "false" then
error(opts.cwd .. ' is not a git directory')
end
else
if use_git_root then
opts.cwd = git_root[1]