mirror of
https://github.com/foomo/posh.git
synced 2026-10-04 14:06:58 +00:00
fix: go-git ref resolve within worktree
This commit is contained in:
@@ -6,7 +6,9 @@ import (
|
||||
)
|
||||
|
||||
func OriginURL() (string, error) {
|
||||
r, err := git.PlainOpen(".")
|
||||
r, err := git.PlainOpenWithOptions(".", &git.PlainOpenOptions{
|
||||
EnableDotGitCommonDir: true,
|
||||
})
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
@@ -206,7 +206,9 @@ func (s *Prompt) Run() error {
|
||||
prompt.OptionPrefix(s.prefix),
|
||||
prompt.OptionLivePrefix(func() (string, bool) {
|
||||
if s.prefixGit {
|
||||
r, err := git.PlainOpen(env.ProjectRoot())
|
||||
r, err := git.PlainOpenWithOptions(env.ProjectRoot(), &git.PlainOpenOptions{
|
||||
EnableDotGitCommonDir: true,
|
||||
})
|
||||
if err != nil {
|
||||
s.l.Debug("failed to open git repository", "error", err)
|
||||
}
|
||||
@@ -216,6 +218,10 @@ func (s *Prompt) Run() error {
|
||||
s.l.Debug("failed to fetch HEAD", "error", err)
|
||||
}
|
||||
|
||||
if ref == nil {
|
||||
return s.prefix, false
|
||||
}
|
||||
|
||||
name := ref.Name().Short()
|
||||
|
||||
if t, err := r.Tags(); err == nil {
|
||||
|
||||
Reference in New Issue
Block a user