diff options
| author | Filip Navara <filip.navara@gmail.com> | 2019-05-03 02:33:11 +0200 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-05-02 20:33:11 -0400 |
| commit | dbb0c9658c637bb987ec7d09a43be5ace5ac6708 (patch) | |
| tree | d96905eee793b8bd323f942db7b5f361177221b6 /modules/git/tree_entry.go | |
| parent | a27d5d2b230e7b63a4b1959991d8b638527f48c6 (diff) | |
| download | gitea-dbb0c9658c637bb987ec7d09a43be5ace5ac6708.tar.gz gitea-dbb0c9658c637bb987ec7d09a43be5ace5ac6708.zip | |
Fix #6813: Allow git.GetTree to take both commit and tree names (#6816)
* Allow git.GetTree to take both commit and tree names, return full paths on entries listed through Tree.ListEntriesRecursive
Signed-off-by: Filip Navara <filip.navara@gmail.com>
* Fix the SHA returned on Git Tree APIs called with commit hash or symbolic name
Signed-off-by: Filip Navara <filip.navara@gmail.com>
Diffstat (limited to 'modules/git/tree_entry.go')
| -rw-r--r-- | modules/git/tree_entry.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/git/tree_entry.go b/modules/git/tree_entry.go index fe2fd14f97..6019e34487 100644 --- a/modules/git/tree_entry.go +++ b/modules/git/tree_entry.go @@ -40,12 +40,16 @@ type TreeEntry struct { gogitTreeEntry *object.TreeEntry ptree *Tree - size int64 - sized bool + size int64 + sized bool + fullName string } // Name returns the name of the entry func (te *TreeEntry) Name() string { + if te.fullName != "" { + return te.fullName + } return te.gogitTreeEntry.Name } |