54dd28f159
If a README file is a symlink to a submodule Gitea the view branch page will return a 500. The underlying problem is a missed conversion of an plumbing.ErrObjectNotFound in git/tree_blob.go. Fix #12599 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
79 lines
1.7 KiB
Go
79 lines
1.7 KiB
Go
// Copyright 2015 The Gogs Authors. All rights reserved.
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package git
|
|
|
|
import (
|
|
"path"
|
|
"strings"
|
|
|
|
"github.com/go-git/go-git/v5/plumbing"
|
|
"github.com/go-git/go-git/v5/plumbing/filemode"
|
|
"github.com/go-git/go-git/v5/plumbing/object"
|
|
)
|
|
|
|
// GetTreeEntryByPath get the tree entries according the sub dir
|
|
func (t *Tree) GetTreeEntryByPath(relpath string) (*TreeEntry, error) {
|
|
if len(relpath) == 0 {
|
|
return &TreeEntry{
|
|
ID: t.ID,
|
|
//Type: ObjectTree,
|
|
gogitTreeEntry: &object.TreeEntry{
|
|
Name: "",
|
|
Mode: filemode.Dir,
|
|
Hash: t.ID,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
relpath = path.Clean(relpath)
|
|
parts := strings.Split(relpath, "/")
|
|
var err error
|
|
tree := t
|
|
for i, name := range parts {
|
|
if i == len(parts)-1 {
|
|
entries, err := tree.ListEntries()
|
|
if err != nil {
|
|
if err == plumbing.ErrObjectNotFound {
|
|
return nil, ErrNotExist{
|
|
RelPath: relpath,
|
|
}
|
|
}
|
|
return nil, err
|
|
}
|
|
for _, v := range entries {
|
|
if v.Name() == name {
|
|
return v, nil
|
|
}
|
|
}
|
|
} else {
|
|
tree, err = tree.SubTree(name)
|
|
if err != nil {
|
|
if err == plumbing.ErrObjectNotFound {
|
|
return nil, ErrNotExist{
|
|
RelPath: relpath,
|
|
}
|
|
}
|
|
return nil, err
|
|
}
|
|
}
|
|
}
|
|
return nil, ErrNotExist{"", relpath}
|
|
}
|
|
|
|
// GetBlobByPath get the blob object according the path
|
|
func (t *Tree) GetBlobByPath(relpath string) (*Blob, error) {
|
|
entry, err := t.GetTreeEntryByPath(relpath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if !entry.IsDir() && !entry.IsSubModule() {
|
|
return entry.Blob(), nil
|
|
}
|
|
|
|
return nil, ErrNotExist{"", relpath}
|
|
}
|