Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use path not filepath in template filenames #21993

Merged
merged 4 commits into from
Dec 1, 2022
Merged

Use path not filepath in template filenames #21993

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1083b2
Use path not filepath in template filenames
zeripath Nov 30, 2022
5fd39b7
Merge branch 'main' into fix-21987-path-not-filepath
lunny Dec 1, 2022
4406077
Merge branch 'main' into fix-21987-path-not-filepath
lunny Dec 1, 2022
9923bd5
Merge branch 'main' into fix-21987-path-not-filepath
lafriks Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/issue/template/unmarshal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package template
import (
"fmt"
"io"
"path/filepath"
"path"
"strconv"

"code.gitea.io/gitea/modules/git"
Expand Down Expand Up @@ -43,7 +43,7 @@ func Unmarshal(filename string, content []byte) (*api.IssueTemplate, error) {

// UnmarshalFromEntry parses out a valid template from the blob in entry
func UnmarshalFromEntry(entry *git.TreeEntry, dir string) (*api.IssueTemplate, error) {
return unmarshalFromEntry(entry, filepath.Join(dir, entry.Name()))
return unmarshalFromEntry(entry, path.Join(dir, entry.Name())) // Filepaths in Git are ALWAYS '/' separated do not use filepath here
}

// UnmarshalFromCommit parses out a valid template from the commit
Expand Down Expand Up @@ -108,7 +108,7 @@ func unmarshal(filename string, content []byte) (*api.IssueTemplate, error) {
// It could be a valid markdown with two horizontal lines, or an invalid markdown with wrong metadata.

it.Content = string(content)
it.Name = filepath.Base(it.FileName)
it.Name = path.Base(it.FileName) // paths in Git are always '/' separated - do not use filepath!
it.About, _ = util.SplitStringAtByteN(it.Content, 80)
} else {
it.Content = templateBody
Expand Down