diff options
author | Michael Muré <batolettre@gmail.com> | 2021-03-29 10:58:10 +0200 |
---|---|---|
committer | Michael Muré <batolettre@gmail.com> | 2021-03-29 11:02:08 +0200 |
commit | aa0449a3eafa42c8c0d44bbdc2b79c5f47bd2d32 (patch) | |
tree | cd0c72a0229bb38cf8096ce198384cdd972f66e2 /repository/gogit.go | |
parent | 5215634d0dca37c545904fbc8a12ddd9b8eb72df (diff) | |
parent | e985653701e8438e27ee5f925fd0aa7c0eef09fe (diff) | |
download | git-bug-aa0449a3eafa42c8c0d44bbdc2b79c5f47bd2d32.tar.gz |
Merge remote-tracking branch 'origin/master' into dag-entity
Diffstat (limited to 'repository/gogit.go')
-rw-r--r-- | repository/gogit.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/repository/gogit.go b/repository/gogit.go index 73672933..248c34d5 100644 --- a/repository/gogit.go +++ b/repository/gogit.go @@ -5,7 +5,6 @@ import ( "fmt" "io/ioutil" "os" - "os/exec" "path/filepath" "sort" "strings" @@ -21,6 +20,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/filemode" "github.com/go-git/go-git/v5/plumbing/object" "golang.org/x/crypto/openpgp" + "golang.org/x/sys/execabs" "github.com/MichaelMure/git-bug/util/lamport" ) @@ -264,7 +264,7 @@ func (repo *GoGitRepo) GetCoreEditor() (string, error) { } for _, cmd := range priorities { - if _, err = exec.LookPath(cmd); err == nil { + if _, err = execabs.LookPath(cmd); err == nil { return cmd, nil } |