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

plumbing: config, Branch name with hash can be cloned. Fixes #309 #354

Merged
merged 4 commits into from Nov 17, 2022
Merged

plumbing: config, Branch name with hash can be cloned. Fixes #309 #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9acce50
plumbing: config, Branch name with hash can be cloned. Fixes #309
Jul 24, 2021
437ae96
plumbing: config, remove duplicated character in set
Jul 24, 2021
a551164
plumbing: config, support correct escaping as per git-config rules
Jul 25, 2021
4efe4cb
plumbing: config, fix broken unit tests
Jul 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions plumbing/format/config/encoder.go
View file
Open in desktop
Expand Up @@ -11,6 +11,10 @@ type Encoder struct {
w io.Writer
}

var (
subsectionReplacer = strings.NewReplacer(`"`, `\"`, `\`, `\\`)
valueReplacer = strings.NewReplacer(`"`, `\"`, `\`, `\\`, "\n", `\n`, "\t", `\t`, "\b", `\b`)
)
// NewEncoder returns a new encoder that writes to w.
func NewEncoder(w io.Writer) *Encoder {
return &Encoder{w}
Expand Down Expand Up @@ -48,8 +52,7 @@ func (e *Encoder) encodeSection(s *Section) error {
}

func (e *Encoder) encodeSubsection(sectionName string, s *Subsection) error {
//TODO: escape
if err := e.printf("[%s \"%s\"]\n", sectionName, s.Name); err != nil {
if err := e.printf("[%s \"%s\"]\n", sectionName, subsectionReplacer.Replace(s.Name)); err != nil {
return err
}

Expand All @@ -58,12 +61,14 @@ func (e *Encoder) encodeSubsection(sectionName string, s *Subsection) error {

func (e *Encoder) encodeOptions(opts Options) error {
for _, o := range opts {
pattern := "\t%s = %s\n"
if strings.Contains(o.Value, "\\") {
pattern = "\t%s = %q\n"
var value string
if strings.ContainsAny(o.Value, "#;\"\t\n\\") || strings.HasPrefix(o.Value, " ") || strings.HasSuffix(o.Value, " ") {
value = `"`+valueReplacer.Replace(o.Value)+`"`
} else {
value = o.Value
}

if err := e.printf(pattern, o.Key, o.Value); err != nil {
if err := e.printf("\t%s = %s\n", o.Key, value); err != nil {
return err
}
}
Expand Down
35 changes: 35 additions & 0 deletions plumbing/format/config/fixtures_test.go
View file
Open in desktop
Expand Up @@ -42,6 +42,41 @@ var fixtures = []*Fixture{
Text: "[core]\n\trepositoryformatversion = 0\n",
Config: New().AddOption("core", "", "repositoryformatversion", "0"),
},
{
Raw: `[section]
option1 = "has # hash"
option2 = "has \" quote"
option3 = "has \\ backslash"
option4 = "has ; semicolon"
option5 = "has \n line-feed"
option6 = "has \t tab"
option7 = " has leading spaces"
option8 = "has trailing spaces "
option9 = has no special characters
option10 = has unusual ` + "\x01\x7f\xc8\x80 characters\n",
Text: `[section]
option1 = "has # hash"
option2 = "has \" quote"
option3 = "has \\ backslash"
option4 = "has ; semicolon"
option5 = "has \n line-feed"
option6 = "has \t tab"
option7 = " has leading spaces"
option8 = "has trailing spaces "
option9 = has no special characters
option10 = has unusual ` + "\x01\x7f\xc8\x80 characters\n",
Config: New().
AddOption("section", "", "option1", `has # hash`).
AddOption("section", "", "option2", `has " quote`).
AddOption("section", "", "option3", `has \ backslash`).
AddOption("section", "", "option4", `has ; semicolon`).
AddOption("section", "", "option5", "has \n line-feed").
AddOption("section", "", "option6", "has \t tab").
AddOption("section", "", "option7", ` has leading spaces`).
AddOption("section", "", "option8", `has trailing spaces `).
AddOption("section", "", "option9", `has no special characters`).
AddOption("section", "", "option10", "has unusual \x01\x7f\u0200 characters"),
},
{
Raw: `
[sect1]
Expand Down